You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/10/18 11:14:57 UTC

[plc4x] branch feature/plc4go updated: - Continued working on the SPI

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

cdutz pushed a commit to branch feature/plc4go
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/plc4go by this push:
     new d89cfd7  - Continued working on the SPI
d89cfd7 is described below

commit d89cfd7b275080cf3b1cbbe2cf6bd98547c8faa4
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Oct 18 13:14:46 2020 +0200

    - Continued working on the SPI
---
 .../examples/read/hello_world_plc4go_write.go      |  53 +++++
 .../plc4go/bacnetip/readwrite/model/APDU.go        |   2 +-
 .../plc4go/bacnetip/readwrite/model/APDUAbort.go   |   6 +-
 .../bacnetip/readwrite/model/APDUComplexAck.go     |   4 +-
 .../readwrite/model/APDUConfirmedRequest.go        |   8 +-
 .../plc4go/bacnetip/readwrite/model/APDUError.go   |   4 +-
 .../plc4go/bacnetip/readwrite/model/APDUReject.go  |   6 +-
 .../bacnetip/readwrite/model/APDUSegmentAck.go     |   8 +-
 .../bacnetip/readwrite/model/APDUSimpleAck.go      |   6 +-
 .../readwrite/model/APDUUnconfirmedRequest.go      |   2 +-
 .../bacnetip/readwrite/model/BACnetAddress.go      |   2 +-
 .../readwrite/model/BACnetConfirmedServiceACK.go   |   2 +-
 .../BACnetConfirmedServiceACKAtomicReadFile.go     |   2 +-
 .../BACnetConfirmedServiceACKAtomicWriteFile.go    |   2 +-
 ...tConfirmedServiceACKConfirmedPrivateTransfer.go |   2 +-
 .../model/BACnetConfirmedServiceACKCreateObject.go |   2 +-
 .../BACnetConfirmedServiceACKGetAlarmSummary.go    |   2 +-
 ...ACnetConfirmedServiceACKGetEnrollmentSummary.go |   2 +-
 ...BACnetConfirmedServiceACKGetEventInformation.go |   2 +-
 .../model/BACnetConfirmedServiceACKReadProperty.go |   2 +-
 ...ACnetConfirmedServiceACKReadPropertyMultiple.go |   2 +-
 .../model/BACnetConfirmedServiceACKReadRange.go    |   2 +-
 ...BACnetConfirmedServiceACKRemovedAuthenticate.go |   2 +-
 ...rmedServiceACKRemovedReadPropertyConditional.go |   2 +-
 .../model/BACnetConfirmedServiceACKVTData.go       |   2 +-
 .../model/BACnetConfirmedServiceACKVTOpen.go       |   2 +-
 .../model/BACnetConfirmedServiceRequest.go         |   2 +-
 ...ACnetConfirmedServiceRequestAcknowledgeAlarm.go |   2 +-
 .../BACnetConfirmedServiceRequestAddListElement.go |   2 +-
 .../BACnetConfirmedServiceRequestAtomicReadFile.go |   2 +-
 ...BACnetConfirmedServiceRequestAtomicWriteFile.go |   2 +-
 ...firmedServiceRequestConfirmedCOVNotification.go |  14 +-
 ...rviceRequestConfirmedCOVNotificationMultiple.go |   2 +-
 ...rmedServiceRequestConfirmedEventNotification.go |   2 +-
 ...firmedServiceRequestConfirmedPrivateTransfer.go |   2 +-
 ...tConfirmedServiceRequestConfirmedTextMessage.go |   2 +-
 .../BACnetConfirmedServiceRequestCreateObject.go   |   2 +-
 .../BACnetConfirmedServiceRequestDeleteObject.go   |   2 +-
 ...rmedServiceRequestDeviceCommunicationControl.go |   2 +-
 ...tConfirmedServiceRequestGetEnrollmentSummary.go |   2 +-
 ...etConfirmedServiceRequestGetEventInformation.go |   2 +-
 ...etConfirmedServiceRequestLifeSafetyOperation.go |   2 +-
 .../BACnetConfirmedServiceRequestReadProperty.go   |   8 +-
 ...tConfirmedServiceRequestReadPropertyMultiple.go |   2 +-
 .../BACnetConfirmedServiceRequestReadRange.go      |   2 +-
 ...netConfirmedServiceRequestReinitializeDevice.go |   2 +-
 ...CnetConfirmedServiceRequestRemoveListElement.go |   2 +-
 ...etConfirmedServiceRequestRemovedAuthenticate.go |   2 +-
 ...ServiceRequestRemovedReadPropertyConditional.go |   2 +-
 ...CnetConfirmedServiceRequestRemovedRequestKey.go |   2 +-
 .../BACnetConfirmedServiceRequestSubscribeCOV.go   |  10 +-
 ...tConfirmedServiceRequestSubscribeCOVProperty.go |   2 +-
 ...edServiceRequestSubscribeCOVPropertyMultiple.go |   2 +-
 .../model/BACnetConfirmedServiceRequestVTClose.go  |   2 +-
 .../model/BACnetConfirmedServiceRequestVTData.go   |   2 +-
 .../model/BACnetConfirmedServiceRequestVTOpen.go   |   2 +-
 .../BACnetConfirmedServiceRequestWriteProperty.go  |   8 +-
 ...ConfirmedServiceRequestWritePropertyMultiple.go |   2 +-
 .../plc4go/bacnetip/readwrite/model/BACnetError.go |   2 +-
 .../readwrite/model/BACnetErrorAtomicReadFile.go   |   2 +-
 .../readwrite/model/BACnetErrorAtomicWriteFile.go  |   2 +-
 .../model/BACnetErrorConfirmedPrivateTransfer.go   |   2 +-
 .../readwrite/model/BACnetErrorCreateObject.go     |   2 +-
 .../readwrite/model/BACnetErrorGetAlarmSummary.go  |   2 +-
 .../model/BACnetErrorGetEnrollmentSummary.go       |   2 +-
 .../model/BACnetErrorGetEventInformation.go        |   2 +-
 .../readwrite/model/BACnetErrorReadProperty.go     |   6 +-
 .../model/BACnetErrorReadPropertyMultiple.go       |   2 +-
 .../readwrite/model/BACnetErrorReadRange.go        |   2 +-
 .../model/BACnetErrorRemovedAuthenticate.go        |   2 +-
 .../BACnetErrorRemovedReadPropertyConditional.go   |   2 +-
 .../bacnetip/readwrite/model/BACnetErrorVTData.go  |   2 +-
 .../bacnetip/readwrite/model/BACnetErrorVTOpen.go  |   2 +-
 .../bacnetip/readwrite/model/BACnetServiceAck.go   |   2 +-
 .../model/BACnetServiceAckAtomicReadFile.go        |   2 +-
 .../model/BACnetServiceAckAtomicWriteFile.go       |   2 +-
 .../BACnetServiceAckConfirmedPrivateTransfer.go    |   2 +-
 .../model/BACnetServiceAckCreateObject.go          |   2 +-
 .../model/BACnetServiceAckGetAlarmSummary.go       |   2 +-
 .../model/BACnetServiceAckGetEnrollmentSummary.go  |   2 +-
 .../model/BACnetServiceAckGetEventInformation.go   |   2 +-
 .../model/BACnetServiceAckReadProperty.go          |   8 +-
 .../model/BACnetServiceAckReadPropertyMultiple.go  |   2 +-
 .../readwrite/model/BACnetServiceAckReadRange.go   |   2 +-
 .../model/BACnetServiceAckRemovedAuthenticate.go   |   2 +-
 ...CnetServiceAckRemovedReadPropertyConditional.go |   2 +-
 .../readwrite/model/BACnetServiceAckVTData.go      |   2 +-
 .../readwrite/model/BACnetServiceAckVTOpen.go      |   2 +-
 .../plc4go/bacnetip/readwrite/model/BACnetTag.go   |   6 +-
 .../model/BACnetTagApplicationBitString.go         |   4 +-
 .../readwrite/model/BACnetTagApplicationBoolean.go |   2 +-
 .../model/BACnetTagApplicationCharacterString.go   |   2 +-
 .../readwrite/model/BACnetTagApplicationDate.go    |   2 +-
 .../readwrite/model/BACnetTagApplicationDouble.go  |   4 +-
 .../model/BACnetTagApplicationEnumerated.go        |   2 +-
 .../readwrite/model/BACnetTagApplicationNull.go    |   2 +-
 .../model/BACnetTagApplicationObjectIdentifier.go  |   2 +-
 .../model/BACnetTagApplicationOctetString.go       |   2 +-
 .../readwrite/model/BACnetTagApplicationReal.go    |   4 +-
 .../model/BACnetTagApplicationSignedInteger.go     |   2 +-
 .../readwrite/model/BACnetTagApplicationTime.go    |   2 +-
 .../model/BACnetTagApplicationUnsignedInteger.go   |   2 +-
 .../bacnetip/readwrite/model/BACnetTagContext.go   |   2 +-
 .../readwrite/model/BACnetTagWithContent.go        |   8 +-
 .../model/BACnetUnconfirmedServiceRequest.go       |   2 +-
 .../model/BACnetUnconfirmedServiceRequestIAm.go    |  12 +-
 .../model/BACnetUnconfirmedServiceRequestIHave.go  |   2 +-
 ...UnconfirmedServiceRequestTimeSynchronization.go |   2 +-
 ...onfirmedServiceRequestUTCTimeSynchronization.go |   2 +-
 ...rmedServiceRequestUnconfirmedCOVNotification.go |   2 +-
 ...iceRequestUnconfirmedCOVNotificationMultiple.go |   2 +-
 ...edServiceRequestUnconfirmedEventNotification.go |   2 +-
 ...rmedServiceRequestUnconfirmedPrivateTransfer.go |   6 +-
 ...onfirmedServiceRequestUnconfirmedTextMessage.go |   2 +-
 .../model/BACnetUnconfirmedServiceRequestWhoHas.go |  10 +-
 .../model/BACnetUnconfirmedServiceRequestWhoIs.go  |   6 +-
 .../BACnetUnconfirmedServiceRequestWriteGroup.go   |   2 +-
 .../plc4go/bacnetip/readwrite/model/BVLC.go        |   4 +-
 .../model/BVLCDeleteForeignDeviceTableEntry.go     |   2 +-
 .../model/BVLCDistributeBroadcastToNetwork.go      |   2 +-
 .../bacnetip/readwrite/model/BVLCForwardedNPDU.go  |   4 +-
 .../readwrite/model/BVLCOriginalBroadcastNPDU.go   |   2 +-
 .../readwrite/model/BVLCOriginalUnicastNPDU.go     |   2 +-
 .../model/BVLCReadBroadcastDistributionTable.go    |   2 +-
 .../model/BVLCReadBroadcastDistributionTableAck.go |   2 +-
 .../readwrite/model/BVLCReadForeignDeviceTable.go  |   2 +-
 .../model/BVLCReadForeignDeviceTableAck.go         |   2 +-
 .../readwrite/model/BVLCRegisterForeignDevice.go   |   2 +-
 .../plc4go/bacnetip/readwrite/model/BVLCResult.go  |   2 +-
 .../bacnetip/readwrite/model/BVLCSecureBVLL.go     |   2 +-
 .../model/BVLCWideBroadcastDistributionTable.go    |   2 +-
 .../plc4go/bacnetip/readwrite/model/NLM.go         |   2 +-
 .../readwrite/model/NLMIAmRouterToNetwork.go       |   2 +-
 .../readwrite/model/NLMWhoIsRouterToNetwork.go     |   2 +-
 .../plc4go/bacnetip/readwrite/model/NPDU.go        |  16 +-
 .../plc4go/knxnetip/readwrite/model/CEMI.go        |   2 +-
 .../readwrite/model/CEMIAdditionalInformation.go   |   2 +-
 .../CEMIAdditionalInformationBusmonitorInfo.go     |   4 +-
 .../CEMIAdditionalInformationRelativeTimestamp.go  |   2 +-
 .../knxnetip/readwrite/model/CEMIBusmonInd.go      |   4 +-
 .../plc4go/knxnetip/readwrite/model/CEMIDataCon.go |   4 +-
 .../knxnetip/readwrite/model/CEMIDataFrame.go      |  10 +-
 .../plc4go/knxnetip/readwrite/model/CEMIDataInd.go |   4 +-
 .../plc4go/knxnetip/readwrite/model/CEMIDataReq.go |   4 +-
 .../knxnetip/readwrite/model/CEMIFrameAck.go       |   2 +-
 .../knxnetip/readwrite/model/CEMIFrameData.go      |  12 +-
 .../knxnetip/readwrite/model/CEMIFrameDataExt.go   |  14 +-
 .../readwrite/model/CEMIFramePollingData.go        |   2 +-
 .../readwrite/model/CEMIFramePollingDataExt.go     |   2 +-
 .../knxnetip/readwrite/model/CEMIMPropReadCon.go   |  14 +-
 .../knxnetip/readwrite/model/CEMIMPropReadReq.go   |  12 +-
 .../knxnetip/readwrite/model/CEMIPollDataCon.go    |   2 +-
 .../knxnetip/readwrite/model/CEMIPollDataReq.go    |   2 +-
 .../plc4go/knxnetip/readwrite/model/CEMIRawCon.go  |   2 +-
 .../plc4go/knxnetip/readwrite/model/CEMIRawInd.go  |   2 +-
 .../plc4go/knxnetip/readwrite/model/CEMIRawReq.go  |   2 +-
 .../knxnetip/readwrite/model/ConnectionRequest.go  |   2 +-
 .../model/ConnectionRequestInformation.go          |   4 +-
 ...ConnectionRequestInformationDeviceManagement.go |   2 +-
 ...ConnectionRequestInformationTunnelConnection.go |   2 +-
 .../knxnetip/readwrite/model/ConnectionResponse.go |   4 +-
 .../readwrite/model/ConnectionResponseDataBlock.go |   4 +-
 .../ConnectionResponseDataBlockDeviceManagement.go |   2 +-
 .../ConnectionResponseDataBlockTunnelConnection.go |   2 +-
 .../readwrite/model/ConnectionStateRequest.go      |   4 +-
 .../readwrite/model/ConnectionStateResponse.go     |   4 +-
 .../knxnetip/readwrite/model/DIBDeviceInfo.go      |   6 +-
 .../knxnetip/readwrite/model/DIBSuppSvcFamilies.go |   4 +-
 .../knxnetip/readwrite/model/DescriptionRequest.go |   2 +-
 .../readwrite/model/DescriptionResponse.go         |   2 +-
 .../readwrite/model/DeviceConfigurationAck.go      |   2 +-
 .../model/DeviceConfigurationAckDataBlock.go       |   6 +-
 .../readwrite/model/DeviceConfigurationRequest.go  |   2 +-
 .../model/DeviceConfigurationRequestDataBlock.go   |   6 +-
 .../knxnetip/readwrite/model/DisconnectRequest.go  |   4 +-
 .../knxnetip/readwrite/model/DisconnectResponse.go |   4 +-
 .../readwrite/model/HPAIControlEndpoint.go         |   4 +-
 .../knxnetip/readwrite/model/HPAIDataEndpoint.go   |   4 +-
 .../readwrite/model/HPAIDiscoveryEndpoint.go       |   4 +-
 .../plc4go/knxnetip/readwrite/model/KNXAddress.go  |   6 +-
 .../readwrite/model/KNXGroupAddress2Level.go       |   6 +-
 .../readwrite/model/KNXGroupAddress3Level.go       |   8 +-
 .../readwrite/model/KNXGroupAddressFreeLevel.go    |   4 +-
 .../knxnetip/readwrite/model/KNXNetIPMessage.go    |   6 +-
 .../knxnetip/readwrite/model/KnxNetIpCore.go       |   4 +-
 .../readwrite/model/KnxNetIpDeviceManagement.go    |   4 +-
 .../knxnetip/readwrite/model/KnxNetIpTunneling.go  |   4 +-
 .../knxnetip/readwrite/model/KnxNetObjectServer.go |   4 +-
 .../model/KnxNetRemoteConfigurationAndDiagnosis.go |   4 +-
 .../readwrite/model/KnxNetRemoteLogging.go         |   4 +-
 .../model/ProjectInstallationIdentifier.go         |   4 +-
 .../knxnetip/readwrite/model/RelativeTimestamp.go  |   2 +-
 .../knxnetip/readwrite/model/RoutingIndication.go  |   2 +-
 .../knxnetip/readwrite/model/SearchRequest.go      |   2 +-
 .../knxnetip/readwrite/model/SearchResponse.go     |   2 +-
 .../plc4go/knxnetip/readwrite/model/ServiceId.go   |   2 +-
 .../knxnetip/readwrite/model/TunnelingRequest.go   |   2 +-
 .../readwrite/model/TunnelingRequestDataBlock.go   |   6 +-
 .../knxnetip/readwrite/model/TunnelingResponse.go  |   2 +-
 .../readwrite/model/TunnelingResponseDataBlock.go  |   6 +-
 .../knxnetip/readwrite/model/UnknownMessage.go     |   2 +-
 .../internal/plc4go/modbus/ModbusConnection.go     |  90 +++++++++
 .../plc4go/internal/plc4go/modbus/ModbusDriver.go  |  31 ++-
 .../{ModbusDriver.go => ModbusFieldHandler.go}     |  10 +-
 .../plc4go/modbus/readwrite/model/ModbusPDU.go     |   2 +-
 .../readwrite/model/ModbusPDUDiagnosticRequest.go  |   6 +-
 .../modbus/readwrite/model/ModbusPDUError.go       |   4 +-
 .../model/ModbusPDUGetComEventLogRequest.go        |   2 +-
 .../model/ModbusPDUGetComEventLogResponse.go       |  10 +-
 .../ModbusPDUMaskWriteHoldingRegisterRequest.go    |   8 +-
 .../ModbusPDUMaskWriteHoldingRegisterResponse.go   |   8 +-
 .../readwrite/model/ModbusPDUReadCoilsRequest.go   |   6 +-
 .../readwrite/model/ModbusPDUReadCoilsResponse.go  |   4 +-
 .../ModbusPDUReadDeviceIdentificationRequest.go    |   2 +-
 .../ModbusPDUReadDeviceIdentificationResponse.go   |   2 +-
 .../model/ModbusPDUReadDiscreteInputsRequest.go    |   6 +-
 .../model/ModbusPDUReadDiscreteInputsResponse.go   |   4 +-
 .../model/ModbusPDUReadExceptionStatusRequest.go   |   2 +-
 .../model/ModbusPDUReadExceptionStatusResponse.go  |   4 +-
 .../model/ModbusPDUReadFifoQueueRequest.go         |   4 +-
 .../model/ModbusPDUReadFifoQueueResponse.go        |   6 +-
 .../model/ModbusPDUReadFileRecordRequest.go        |   4 +-
 .../model/ModbusPDUReadFileRecordRequestItem.go    |   8 +-
 .../model/ModbusPDUReadFileRecordResponse.go       |   4 +-
 .../model/ModbusPDUReadFileRecordResponseItem.go   |   4 +-
 .../model/ModbusPDUReadHoldingRegistersRequest.go  |   6 +-
 .../model/ModbusPDUReadHoldingRegistersResponse.go |   4 +-
 .../model/ModbusPDUReadInputRegistersRequest.go    |   6 +-
 .../model/ModbusPDUReadInputRegistersResponse.go   |   4 +-
 ...sPDUReadWriteMultipleHoldingRegistersRequest.go |  12 +-
 ...PDUReadWriteMultipleHoldingRegistersResponse.go |   4 +-
 .../model/ModbusPDUReportServerIdRequest.go        |   2 +-
 .../model/ModbusPDUReportServerIdResponse.go       |   4 +-
 .../model/ModbusPDUWriteFileRecordRequest.go       |   4 +-
 .../model/ModbusPDUWriteFileRecordRequestItem.go   |   8 +-
 .../model/ModbusPDUWriteFileRecordResponse.go      |   4 +-
 .../model/ModbusPDUWriteFileRecordResponseItem.go  |   8 +-
 .../model/ModbusPDUWriteMultipleCoilsRequest.go    |   8 +-
 .../model/ModbusPDUWriteMultipleCoilsResponse.go   |   6 +-
 ...odbusPDUWriteMultipleHoldingRegistersRequest.go |   8 +-
 ...dbusPDUWriteMultipleHoldingRegistersResponse.go |   6 +-
 .../model/ModbusPDUWriteSingleCoilRequest.go       |   6 +-
 .../model/ModbusPDUWriteSingleCoilResponse.go      |   6 +-
 .../model/ModbusPDUWriteSingleRegisterRequest.go   |   6 +-
 .../model/ModbusPDUWriteSingleRegisterResponse.go  |   6 +-
 .../modbus/readwrite/model/ModbusSerialADU.go      |   6 +-
 .../plc4go/modbus/readwrite/model/ModbusTcpADU.go  |   6 +-
 ...lc_read_request.go => DefaultPlcReadRequest.go} |  47 ++---
 .../plc4go/model/DefaultPlcWriteRequest.go         |  83 ++++++++
 .../plc4go/model/{plc_reader.go => PlcReader.go}   |   2 +-
 .../plc4go/model/{plc_writer.go => PlcWriter.go}   |   2 +-
 .../internal/plc4go/model/plc_write_request.go     |  76 -------
 .../plc4go/s7/readwrite/model/COTPPacket.go        |   4 +-
 .../readwrite/model/COTPPacketConnectionRequest.go |   6 +-
 .../model/COTPPacketConnectionResponse.go          |   6 +-
 .../plc4go/s7/readwrite/model/COTPPacketData.go    |   4 +-
 .../readwrite/model/COTPPacketDisconnectRequest.go |   6 +-
 .../model/COTPPacketDisconnectResponse.go          |   6 +-
 .../s7/readwrite/model/COTPPacketTpduError.go      |   6 +-
 .../plc4go/s7/readwrite/model/COTPParameter.go     |   4 +-
 .../s7/readwrite/model/COTPParameterCalledTsap.go  |   4 +-
 .../s7/readwrite/model/COTPParameterCallingTsap.go |   4 +-
 .../s7/readwrite/model/COTPParameterChecksum.go    |   4 +-
 ...COTPParameterDisconnectAdditionalInformation.go |   2 +-
 .../s7/readwrite/model/COTPParameterTpduSize.go    |   2 +-
 .../plc4go/s7/readwrite/model/S7Address.go         |   2 +-
 .../plc4go/s7/readwrite/model/S7AddressAny.go      |  10 +-
 .../plc4go/s7/readwrite/model/S7Message.go         |  10 +-
 .../plc4go/s7/readwrite/model/S7MessageRequest.go  |   2 +-
 .../plc4go/s7/readwrite/model/S7MessageResponse.go |   6 +-
 .../s7/readwrite/model/S7MessageResponseData.go    |   6 +-
 .../plc4go/s7/readwrite/model/S7MessageUserData.go |   2 +-
 .../plc4go/s7/readwrite/model/S7Parameter.go       |   2 +-
 .../readwrite/model/S7ParameterReadVarRequest.go   |   4 +-
 .../readwrite/model/S7ParameterReadVarResponse.go  |   4 +-
 .../model/S7ParameterSetupCommunication.go         |   8 +-
 .../s7/readwrite/model/S7ParameterUserData.go      |   4 +-
 .../s7/readwrite/model/S7ParameterUserDataItem.go  |   2 +-
 .../model/S7ParameterUserDataItemCPUFunctions.go   |  14 +-
 .../readwrite/model/S7ParameterWriteVarRequest.go  |   4 +-
 .../readwrite/model/S7ParameterWriteVarResponse.go |   4 +-
 .../s7/readwrite/model/S7PayloadReadVarResponse.go |   4 +-
 .../plc4go/s7/readwrite/model/S7PayloadUserData.go |   2 +-
 .../s7/readwrite/model/S7PayloadUserDataItem.go    |   4 +-
 ...PayloadUserDataItemCpuFunctionReadSzlRequest.go |   2 +-
 ...ayloadUserDataItemCpuFunctionReadSzlResponse.go |   4 +-
 .../s7/readwrite/model/S7PayloadWriteVarRequest.go |   4 +-
 .../readwrite/model/S7PayloadWriteVarResponse.go   |   2 +-
 .../s7/readwrite/model/S7VarPayloadDataItem.go     |   6 +-
 .../readwrite/model/S7VarRequestParameterItem.go   |   2 +-
 .../model/S7VarRequestParameterItemAddress.go      |   4 +-
 .../plc4go/s7/readwrite/model/SzlDataTreeItem.go   |   8 +-
 .../internal/plc4go/s7/readwrite/model/SzlId.go    |   2 +-
 .../plc4go/s7/readwrite/model/TPKTPacket.go        |   2 +-
 .../PlcFieldHandler.go}                            |   4 +-
 .../ModbusDriver.go => spi/PlcValueHandler.go}     |   8 +-
 .../plc_reader.go => spi/model/PlcReadRequest.go}  |  11 +-
 .../plc4go/spi/values/PlcList.go}                  |  12 +-
 .../plc4go/spi/values/PlcSimpleValueAdapter.go}    |  34 ++--
 .../plc4go/spi/values/PlcStruct.go}                |  12 +-
 .../internal/plc4go/spi/values/PlcValueAdapter.go  | 182 +++++++++++++++++
 .../plc4go/spi/values/iec61131/BOOL.go}            |  17 +-
 .../plc4go/spi/values/iec61131/BYTE.go}            |  10 +-
 .../plc4go/spi/values/iec61131/CHAR.go}            |   6 +-
 .../plc4go/spi/values/iec61131/DATE.go}            |  10 +-
 .../plc4go/spi/values/iec61131/DATE_AND_TIME.go}   |  10 +-
 .../plc4go/spi/values/iec61131/DINT.go}            |   9 +-
 .../plc4go/spi/values/iec61131/DWORD.go}           |  10 +-
 .../spi/values/iec61131/IEC61131ValueHandler.go    | 224 +++++++++++++++++++++
 .../plc4go/spi/values/iec61131/INT.go}             |   9 +-
 .../plc4go/spi/values/iec61131/LINT.go}            |   9 +-
 .../plc4go/spi/values/iec61131/LREAL.go}           |   9 +-
 .../plc4go/spi/values/iec61131/LTIME.go}           |  15 +-
 .../plc4go/spi/values/iec61131/LWORD.go}           |  10 +-
 .../plc4go/spi/values/iec61131/NULL.go}            |   6 +-
 .../plc4go/spi/values/iec61131/REAL.go}            |   9 +-
 .../plc4go/spi/values/iec61131/SINT.go}            |   6 +-
 .../plc4go/spi/values/iec61131/STRING.go}          |   6 +-
 .../plc4go/spi/values/iec61131/TIME.go}            |  15 +-
 .../plc4go/spi/values/iec61131/TIME_OF_DAY.go}     |  12 +-
 .../plc4go/spi/values/iec61131/UDINT.go}           |   9 +-
 .../plc4go/spi/values/iec61131/UINT.go}            |   9 +-
 .../plc4go/spi/values/iec61131/ULINT.go}           |   9 +-
 .../plc4go/spi/values/iec61131/USINT.go}           |   9 +-
 .../plc4go/spi/values/iec61131/WCHAR.go}           |   5 +-
 .../plc4go/spi/values/iec61131/WORD.go}            |  10 +-
 .../plc4go/spi/values/iec61131/WSTRING.go}         |   9 +-
 sandbox/plc4go/pkg/plc4go/driver.go                |   7 +-
 sandbox/plc4go/pkg/plc4go/model/plc_field.go       |   1 +
 .../plc4go/pkg/plc4go/model/plc_read_request.go    |   2 +-
 .../plc4go/pkg/plc4go/model/plc_write_request.go   |   4 +-
 sandbox/plc4go/pkg/plc4go/values/plc_value.go      | 163 +--------------
 332 files changed, 1446 insertions(+), 936 deletions(-)

diff --git a/sandbox/plc4go/examples/read/hello_world_plc4go_write.go b/sandbox/plc4go/examples/read/hello_world_plc4go_write.go
new file mode 100644
index 0000000..d9ad5fb
--- /dev/null
+++ b/sandbox/plc4go/examples/read/hello_world_plc4go_write.go
@@ -0,0 +1,53 @@
+package read
+
+import (
+	"encoding/json"
+	"fmt"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+)
+
+func main() int {
+	// Get a connection to a remote PLC
+	crc := plc4go.NewPlcDriverManager().GetConnectedConnection("s7://192.168.23.30")
+
+	// Wait for the driver to connect (or not)
+	connectionResult := <-crc
+	if connectionResult.Err != nil {
+		_ = fmt.Errorf("error connecting to PLC: %s", connectionResult.Err.Error())
+		return 1
+	}
+	connection := connectionResult.Connection
+
+	// Make sure the connection is closed at the end
+	defer connection.Close()
+
+	// Prepare a write-request
+	rrb := connection.WriteRequestBuilder()
+	rrb.AddField("output-field", "%Q0.0:BOOL", true)
+	rrb.AddField("input-field", "%I0.0:USINT", 42)
+	readRequest, err := rrb.Build()
+	if err != nil {
+		_ = fmt.Errorf("error preparing read-request: %s", connectionResult.Err.Error())
+		return 2
+	}
+
+	// Execute a read-request
+	rrc := readRequest.Execute()
+
+	// Wait for the response to finish
+	rrr := <-rrc
+	if rrr.Err != nil {
+		_ = fmt.Errorf("error executing read-request: %s", rrr.Err.Error())
+		return 3
+	}
+
+	// Do something with the response
+	readResponseJson, err := json.Marshal(rrr.Response)
+	if err != nil {
+		_ = fmt.Errorf("error serializing read-response: %s", err.Error())
+		return 4
+	}
+	fmt.Printf("Result: %s\n", string(readResponseJson))
+
+	return 0
+}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
index 9b4aa69..4a4d507 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
@@ -118,7 +118,7 @@ func APDUSerialize(io spi.WriteBuffer, m APDU, i IAPDU, childSerialize func() er
 
 	// Discriminator Field (apduType) (Used as input to a switch field)
 	apduType := uint8(i.ApduType())
-	_apduTypeErr := io.WriteUint8(4, (apduType))
+	_apduTypeErr := io.WriteUint8(4, apduType)
 	if _apduTypeErr != nil {
 		return errors.New("Error serializing 'apduType' field " + _apduTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
index 48e2669..f2bfb1d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
@@ -72,7 +72,7 @@ func CastAPDUAbort(structType interface{}) APDUAbort {
 }
 
 func (m APDUAbort) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 3
@@ -151,14 +151,14 @@ func (m APDUAbort) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
 
 		// Simple Field (abortReason)
 		abortReason := uint8(m.AbortReason)
-		_abortReasonErr := io.WriteUint8(8, (abortReason))
+		_abortReasonErr := io.WriteUint8(8, abortReason)
 		if _abortReasonErr != nil {
 			return errors.New("Error serializing 'abortReason' field " + _abortReasonErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
index 140bc3d..caa0027 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
@@ -76,7 +76,7 @@ func CastAPDUComplexAck(structType interface{}) APDUComplexAck {
 }
 
 func (m APDUComplexAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Simple field (segmentedMessage)
 	lengthInBits += 1
@@ -208,7 +208,7 @@ func (m APDUComplexAck) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index eb191ee..c2b0e04 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -79,7 +79,7 @@ func CastAPDUConfirmedRequest(structType interface{}) APDUConfirmedRequest {
 }
 
 func (m APDUConfirmedRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Simple field (segmentedMessage)
 	lengthInBits += 1
@@ -245,21 +245,21 @@ func (m APDUConfirmedRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (maxSegmentsAccepted)
 		maxSegmentsAccepted := uint8(m.MaxSegmentsAccepted)
-		_maxSegmentsAcceptedErr := io.WriteUint8(3, (maxSegmentsAccepted))
+		_maxSegmentsAcceptedErr := io.WriteUint8(3, maxSegmentsAccepted)
 		if _maxSegmentsAcceptedErr != nil {
 			return errors.New("Error serializing 'maxSegmentsAccepted' field " + _maxSegmentsAcceptedErr.Error())
 		}
 
 		// Simple Field (maxApduLengthAccepted)
 		maxApduLengthAccepted := uint8(m.MaxApduLengthAccepted)
-		_maxApduLengthAcceptedErr := io.WriteUint8(4, (maxApduLengthAccepted))
+		_maxApduLengthAcceptedErr := io.WriteUint8(4, maxApduLengthAccepted)
 		if _maxApduLengthAcceptedErr != nil {
 			return errors.New("Error serializing 'maxApduLengthAccepted' field " + _maxApduLengthAcceptedErr.Error())
 		}
 
 		// Simple Field (invokeId)
 		invokeId := uint8(m.InvokeId)
-		_invokeIdErr := io.WriteUint8(8, (invokeId))
+		_invokeIdErr := io.WriteUint8(8, invokeId)
 		if _invokeIdErr != nil {
 			return errors.New("Error serializing 'invokeId' field " + _invokeIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
index cfe8bd7..806c480 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
@@ -72,7 +72,7 @@ func CastAPDUError(structType interface{}) APDUError {
 }
 
 func (m APDUError) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 4
@@ -140,7 +140,7 @@ func (m APDUError) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
index c283b45..8b8d6f0 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
@@ -71,7 +71,7 @@ func CastAPDUReject(structType interface{}) APDUReject {
 }
 
 func (m APDUReject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 4
@@ -134,14 +134,14 @@ func (m APDUReject) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
 
 		// Simple Field (rejectReason)
 		rejectReason := uint8(m.RejectReason)
-		_rejectReasonErr := io.WriteUint8(8, (rejectReason))
+		_rejectReasonErr := io.WriteUint8(8, rejectReason)
 		if _rejectReasonErr != nil {
 			return errors.New("Error serializing 'rejectReason' field " + _rejectReasonErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
index 753d22d..5650873 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -74,7 +74,7 @@ func CastAPDUSegmentAck(structType interface{}) APDUSegmentAck {
 }
 
 func (m APDUSegmentAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 2
@@ -178,21 +178,21 @@ func (m APDUSegmentAck) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
 
 		// Simple Field (sequenceNumber)
 		sequenceNumber := uint8(m.SequenceNumber)
-		_sequenceNumberErr := io.WriteUint8(8, (sequenceNumber))
+		_sequenceNumberErr := io.WriteUint8(8, sequenceNumber)
 		if _sequenceNumberErr != nil {
 			return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
 		}
 
 		// Simple Field (proposedWindowSize)
 		proposedWindowSize := uint8(m.ProposedWindowSize)
-		_proposedWindowSizeErr := io.WriteUint8(8, (proposedWindowSize))
+		_proposedWindowSizeErr := io.WriteUint8(8, proposedWindowSize)
 		if _proposedWindowSizeErr != nil {
 			return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
index c77253a..ce2e82a 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -71,7 +71,7 @@ func CastAPDUSimpleAck(structType interface{}) APDUSimpleAck {
 }
 
 func (m APDUSimpleAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 4
@@ -134,14 +134,14 @@ func (m APDUSimpleAck) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (originalInvokeId)
 		originalInvokeId := uint8(m.OriginalInvokeId)
-		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		_originalInvokeIdErr := io.WriteUint8(8, originalInvokeId)
 		if _originalInvokeIdErr != nil {
 			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
 		}
 
 		// Simple Field (serviceChoice)
 		serviceChoice := uint8(m.ServiceChoice)
-		_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+		_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 		if _serviceChoiceErr != nil {
 			return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index f942f38..180c526 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -71,7 +71,7 @@ func CastAPDUUnconfirmedRequest(structType interface{}) APDUUnconfirmedRequest {
 }
 
 func (m APDUUnconfirmedRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.APDU.LengthInBits()
+	var lengthInBits = m.APDU.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 4
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
index fc3ddb3..18261a5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
@@ -115,7 +115,7 @@ func (m BACnetAddress) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (port)
 	port := uint16(m.Port)
-	_portErr := io.WriteUint16(16, (port))
+	_portErr := io.WriteUint16(16, port)
 	if _portErr != nil {
 		return errors.New("Error serializing 'port' field " + _portErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
index 133eace..2b1438f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
@@ -130,7 +130,7 @@ func BACnetConfirmedServiceACKSerialize(io spi.WriteBuffer, m BACnetConfirmedSer
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
 	serviceChoice := uint8(i.ServiceChoice())
-	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 	if _serviceChoiceErr != nil {
 		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
index 3538648..f4a39a2 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKAtomicReadFile(structType interface{}) BACnetC
 }
 
 func (m BACnetConfirmedServiceACKAtomicReadFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
index 10ff1cf..3e70753 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKAtomicWriteFile(structType interface{}) BACnet
 }
 
 func (m BACnetConfirmedServiceACKAtomicWriteFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
index ba2f5e3..6c88956 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(structType interface{
 }
 
 func (m BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
index a5590c2..5184cc0 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKCreateObject(structType interface{}) BACnetCon
 }
 
 func (m BACnetConfirmedServiceACKCreateObject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
index e903b17..052c08c 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKGetAlarmSummary(structType interface{}) BACnet
 }
 
 func (m BACnetConfirmedServiceACKGetAlarmSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
index a2873ba..df02484 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKGetEnrollmentSummary(structType interface{}) B
 }
 
 func (m BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
index 5bf064a..cb19773 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKGetEventInformation(structType interface{}) BA
 }
 
 func (m BACnetConfirmedServiceACKGetEventInformation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
index e50328b..27c0d84 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKReadProperty(structType interface{}) BACnetCon
 }
 
 func (m BACnetConfirmedServiceACKReadProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
index fd696e2..c846d59 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKReadPropertyMultiple(structType interface{}) B
 }
 
 func (m BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
index 1ff9dc5..4d04950 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKReadRange(structType interface{}) BACnetConfir
 }
 
 func (m BACnetConfirmedServiceACKReadRange) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
index d0c5481..819d67d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKRemovedAuthenticate(structType interface{}) BA
 }
 
 func (m BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
index a27f717..152da95 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(structType inte
 }
 
 func (m BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
index 6094926..a807310 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKVTData(structType interface{}) BACnetConfirmed
 }
 
 func (m BACnetConfirmedServiceACKVTData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
index 3ae1769..7021a8f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceACKVTOpen(structType interface{}) BACnetConfirmed
 }
 
 func (m BACnetConfirmedServiceACKVTOpen) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceACK.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceACK.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index a0498d2..aa8c457 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -176,7 +176,7 @@ func BACnetConfirmedServiceRequestSerialize(io spi.WriteBuffer, m BACnetConfirme
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
 	serviceChoice := uint8(i.ServiceChoice())
-	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 	if _serviceChoiceErr != nil {
 		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index e59f0de..c2116ee 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestAcknowledgeAlarm(structType interface{}) B
 }
 
 func (m BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index c3dd842..f8ab70b 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestAddListElement(structType interface{}) BAC
 }
 
 func (m BACnetConfirmedServiceRequestAddListElement) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index 5224418..9ad5042 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestAtomicReadFile(structType interface{}) BAC
 }
 
 func (m BACnetConfirmedServiceRequestAtomicReadFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 3394a50..4797853 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestAtomicWriteFile(structType interface{}) BA
 }
 
 func (m BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index b96dd3c..c46fe32 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -86,7 +86,7 @@ func CastBACnetConfirmedServiceRequestConfirmedCOVNotification(structType interf
 }
 
 func (m BACnetConfirmedServiceRequestConfirmedCOVNotification) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	// Const Field (subscriberProcessIdentifierHeader)
 	lengthInBits += 8
@@ -280,7 +280,7 @@ func (m BACnetConfirmedServiceRequestConfirmedCOVNotification) Serialize(io spi.
 
 		// Simple Field (subscriberProcessIdentifier)
 		subscriberProcessIdentifier := uint8(m.SubscriberProcessIdentifier)
-		_subscriberProcessIdentifierErr := io.WriteUint8(8, (subscriberProcessIdentifier))
+		_subscriberProcessIdentifierErr := io.WriteUint8(8, subscriberProcessIdentifier)
 		if _subscriberProcessIdentifierErr != nil {
 			return errors.New("Error serializing 'subscriberProcessIdentifier' field " + _subscriberProcessIdentifierErr.Error())
 		}
@@ -293,14 +293,14 @@ func (m BACnetConfirmedServiceRequestConfirmedCOVNotification) Serialize(io spi.
 
 		// Simple Field (monitoredObjectType)
 		monitoredObjectType := uint16(m.MonitoredObjectType)
-		_monitoredObjectTypeErr := io.WriteUint16(10, (monitoredObjectType))
+		_monitoredObjectTypeErr := io.WriteUint16(10, monitoredObjectType)
 		if _monitoredObjectTypeErr != nil {
 			return errors.New("Error serializing 'monitoredObjectType' field " + _monitoredObjectTypeErr.Error())
 		}
 
 		// Simple Field (monitoredObjectInstanceNumber)
 		monitoredObjectInstanceNumber := uint32(m.MonitoredObjectInstanceNumber)
-		_monitoredObjectInstanceNumberErr := io.WriteUint32(22, (monitoredObjectInstanceNumber))
+		_monitoredObjectInstanceNumberErr := io.WriteUint32(22, monitoredObjectInstanceNumber)
 		if _monitoredObjectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'monitoredObjectInstanceNumber' field " + _monitoredObjectInstanceNumberErr.Error())
 		}
@@ -313,14 +313,14 @@ func (m BACnetConfirmedServiceRequestConfirmedCOVNotification) Serialize(io spi.
 
 		// Simple Field (issueConfirmedNotificationsType)
 		issueConfirmedNotificationsType := uint16(m.IssueConfirmedNotificationsType)
-		_issueConfirmedNotificationsTypeErr := io.WriteUint16(10, (issueConfirmedNotificationsType))
+		_issueConfirmedNotificationsTypeErr := io.WriteUint16(10, issueConfirmedNotificationsType)
 		if _issueConfirmedNotificationsTypeErr != nil {
 			return errors.New("Error serializing 'issueConfirmedNotificationsType' field " + _issueConfirmedNotificationsTypeErr.Error())
 		}
 
 		// Simple Field (issueConfirmedNotificationsInstanceNumber)
 		issueConfirmedNotificationsInstanceNumber := uint32(m.IssueConfirmedNotificationsInstanceNumber)
-		_issueConfirmedNotificationsInstanceNumberErr := io.WriteUint32(22, (issueConfirmedNotificationsInstanceNumber))
+		_issueConfirmedNotificationsInstanceNumberErr := io.WriteUint32(22, issueConfirmedNotificationsInstanceNumber)
 		if _issueConfirmedNotificationsInstanceNumberErr != nil {
 			return errors.New("Error serializing 'issueConfirmedNotificationsInstanceNumber' field " + _issueConfirmedNotificationsInstanceNumberErr.Error())
 		}
@@ -333,7 +333,7 @@ func (m BACnetConfirmedServiceRequestConfirmedCOVNotification) Serialize(io spi.
 
 		// Simple Field (lifetimeLength)
 		lifetimeLength := uint8(m.LifetimeLength)
-		_lifetimeLengthErr := io.WriteUint8(3, (lifetimeLength))
+		_lifetimeLengthErr := io.WriteUint8(3, lifetimeLength)
 		if _lifetimeLengthErr != nil {
 			return errors.New("Error serializing 'lifetimeLength' field " + _lifetimeLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index 16b0c0b..ac29276 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple(structTyp
 }
 
 func (m BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index f2ef767..bd8bf0e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestConfirmedEventNotification(structType inte
 }
 
 func (m BACnetConfirmedServiceRequestConfirmedEventNotification) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index b80a261..e36c12a 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestConfirmedPrivateTransfer(structType interf
 }
 
 func (m BACnetConfirmedServiceRequestConfirmedPrivateTransfer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index 3c6aaa1..e2a45aa 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestConfirmedTextMessage(structType interface{
 }
 
 func (m BACnetConfirmedServiceRequestConfirmedTextMessage) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index e20f26d..8b9a8f5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestCreateObject(structType interface{}) BACne
 }
 
 func (m BACnetConfirmedServiceRequestCreateObject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
index c26cbf3..336b7b1 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestDeleteObject(structType interface{}) BACne
 }
 
 func (m BACnetConfirmedServiceRequestDeleteObject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index b0bebab..36e3ae2 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestDeviceCommunicationControl(structType inte
 }
 
 func (m BACnetConfirmedServiceRequestDeviceCommunicationControl) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index 46fc1e6..fcd4fcd 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestGetEnrollmentSummary(structType interface{
 }
 
 func (m BACnetConfirmedServiceRequestGetEnrollmentSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index 9d9e254..ecccc5a 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestGetEventInformation(structType interface{}
 }
 
 func (m BACnetConfirmedServiceRequestGetEventInformation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index 77458ca..87327f6 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestLifeSafetyOperation(structType interface{}
 }
 
 func (m BACnetConfirmedServiceRequestLifeSafetyOperation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 950ffc0..b24041c 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -77,7 +77,7 @@ func CastBACnetConfirmedServiceRequestReadProperty(structType interface{}) BACne
 }
 
 func (m BACnetConfirmedServiceRequestReadProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	// Const Field (objectIdentifierHeader)
 	lengthInBits += 8
@@ -171,14 +171,14 @@ func (m BACnetConfirmedServiceRequestReadProperty) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (objectType)
 		objectType := uint16(m.ObjectType)
-		_objectTypeErr := io.WriteUint16(10, (objectType))
+		_objectTypeErr := io.WriteUint16(10, objectType)
 		if _objectTypeErr != nil {
 			return errors.New("Error serializing 'objectType' field " + _objectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstanceNumber)
 		objectInstanceNumber := uint32(m.ObjectInstanceNumber)
-		_objectInstanceNumberErr := io.WriteUint32(22, (objectInstanceNumber))
+		_objectInstanceNumberErr := io.WriteUint32(22, objectInstanceNumber)
 		if _objectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'objectInstanceNumber' field " + _objectInstanceNumberErr.Error())
 		}
@@ -191,7 +191,7 @@ func (m BACnetConfirmedServiceRequestReadProperty) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (propertyIdentifierLength)
 		propertyIdentifierLength := uint8(m.PropertyIdentifierLength)
-		_propertyIdentifierLengthErr := io.WriteUint8(3, (propertyIdentifierLength))
+		_propertyIdentifierLengthErr := io.WriteUint8(3, propertyIdentifierLength)
 		if _propertyIdentifierLengthErr != nil {
 			return errors.New("Error serializing 'propertyIdentifierLength' field " + _propertyIdentifierLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index 49245be..2909daa 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestReadPropertyMultiple(structType interface{
 }
 
 func (m BACnetConfirmedServiceRequestReadPropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index 61d3b17..3816fb1 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestReadRange(structType interface{}) BACnetCo
 }
 
 func (m BACnetConfirmedServiceRequestReadRange) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index 2a45777..53b5f33 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestReinitializeDevice(structType interface{})
 }
 
 func (m BACnetConfirmedServiceRequestReinitializeDevice) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index b64f6e2..dad3804 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestRemoveListElement(structType interface{})
 }
 
 func (m BACnetConfirmedServiceRequestRemoveListElement) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
index 45ef9d0..001d652 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestRemovedAuthenticate(structType interface{}
 }
 
 func (m BACnetConfirmedServiceRequestRemovedAuthenticate) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
index 181e5eb..d4da415 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestRemovedReadPropertyConditional(structType
 }
 
 func (m BACnetConfirmedServiceRequestRemovedReadPropertyConditional) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
index 02db147..a8286c4 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestRemovedRequestKey(structType interface{})
 }
 
 func (m BACnetConfirmedServiceRequestRemovedRequestKey) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index 1392254..5d7e583 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -82,7 +82,7 @@ func CastBACnetConfirmedServiceRequestSubscribeCOV(structType interface{}) BACne
 }
 
 func (m BACnetConfirmedServiceRequestSubscribeCOV) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	// Const Field (subscriberProcessIdentifierHeader)
 	lengthInBits += 8
@@ -230,7 +230,7 @@ func (m BACnetConfirmedServiceRequestSubscribeCOV) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (subscriberProcessIdentifier)
 		subscriberProcessIdentifier := uint8(m.SubscriberProcessIdentifier)
-		_subscriberProcessIdentifierErr := io.WriteUint8(8, (subscriberProcessIdentifier))
+		_subscriberProcessIdentifierErr := io.WriteUint8(8, subscriberProcessIdentifier)
 		if _subscriberProcessIdentifierErr != nil {
 			return errors.New("Error serializing 'subscriberProcessIdentifier' field " + _subscriberProcessIdentifierErr.Error())
 		}
@@ -243,14 +243,14 @@ func (m BACnetConfirmedServiceRequestSubscribeCOV) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (monitoredObjectType)
 		monitoredObjectType := uint16(m.MonitoredObjectType)
-		_monitoredObjectTypeErr := io.WriteUint16(10, (monitoredObjectType))
+		_monitoredObjectTypeErr := io.WriteUint16(10, monitoredObjectType)
 		if _monitoredObjectTypeErr != nil {
 			return errors.New("Error serializing 'monitoredObjectType' field " + _monitoredObjectTypeErr.Error())
 		}
 
 		// Simple Field (monitoredObjectInstanceNumber)
 		monitoredObjectInstanceNumber := uint32(m.MonitoredObjectInstanceNumber)
-		_monitoredObjectInstanceNumberErr := io.WriteUint32(22, (monitoredObjectInstanceNumber))
+		_monitoredObjectInstanceNumberErr := io.WriteUint32(22, monitoredObjectInstanceNumber)
 		if _monitoredObjectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'monitoredObjectInstanceNumber' field " + _monitoredObjectInstanceNumberErr.Error())
 		}
@@ -282,7 +282,7 @@ func (m BACnetConfirmedServiceRequestSubscribeCOV) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (lifetimeLength)
 		lifetimeLength := uint8(m.LifetimeLength)
-		_lifetimeLengthErr := io.WriteUint8(3, (lifetimeLength))
+		_lifetimeLengthErr := io.WriteUint8(3, lifetimeLength)
 		if _lifetimeLengthErr != nil {
 			return errors.New("Error serializing 'lifetimeLength' field " + _lifetimeLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index 4231daf..705157e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestSubscribeCOVProperty(structType interface{
 }
 
 func (m BACnetConfirmedServiceRequestSubscribeCOVProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index aa3fce7..c2cd8d5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple(structType in
 }
 
 func (m BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index c0b6148..fcaa2e3 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestVTClose(structType interface{}) BACnetConf
 }
 
 func (m BACnetConfirmedServiceRequestVTClose) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
index 3f4fb20..ceb4528 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestVTData(structType interface{}) BACnetConfi
 }
 
 func (m BACnetConfirmedServiceRequestVTData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
index 8dec9c6..fa5a692 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestVTOpen(structType interface{}) BACnetConfi
 }
 
 func (m BACnetConfirmedServiceRequestVTOpen) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 06a12da..2fd4cfa 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -82,7 +82,7 @@ func CastBACnetConfirmedServiceRequestWriteProperty(structType interface{}) BACn
 }
 
 func (m BACnetConfirmedServiceRequestWriteProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	// Const Field (objectIdentifierHeader)
 	lengthInBits += 8
@@ -237,14 +237,14 @@ func (m BACnetConfirmedServiceRequestWriteProperty) Serialize(io spi.WriteBuffer
 
 		// Simple Field (objectType)
 		objectType := uint16(m.ObjectType)
-		_objectTypeErr := io.WriteUint16(10, (objectType))
+		_objectTypeErr := io.WriteUint16(10, objectType)
 		if _objectTypeErr != nil {
 			return errors.New("Error serializing 'objectType' field " + _objectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstanceNumber)
 		objectInstanceNumber := uint32(m.ObjectInstanceNumber)
-		_objectInstanceNumberErr := io.WriteUint32(22, (objectInstanceNumber))
+		_objectInstanceNumberErr := io.WriteUint32(22, objectInstanceNumber)
 		if _objectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'objectInstanceNumber' field " + _objectInstanceNumberErr.Error())
 		}
@@ -257,7 +257,7 @@ func (m BACnetConfirmedServiceRequestWriteProperty) Serialize(io spi.WriteBuffer
 
 		// Simple Field (propertyIdentifierLength)
 		propertyIdentifierLength := uint8(m.PropertyIdentifierLength)
-		_propertyIdentifierLengthErr := io.WriteUint8(3, (propertyIdentifierLength))
+		_propertyIdentifierLengthErr := io.WriteUint8(3, propertyIdentifierLength)
 		if _propertyIdentifierLengthErr != nil {
 			return errors.New("Error serializing 'propertyIdentifierLength' field " + _propertyIdentifierLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index deca851..3d3aa55 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetConfirmedServiceRequestWritePropertyMultiple(structType interface
 }
 
 func (m BACnetConfirmedServiceRequestWritePropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetConfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetConfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
index cb557ee..0ccf792 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
@@ -130,7 +130,7 @@ func BACnetErrorSerialize(io spi.WriteBuffer, m BACnetError, i IBACnetError, chi
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
 	serviceChoice := uint8(i.ServiceChoice())
-	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 	if _serviceChoiceErr != nil {
 		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
index 7599ae1..65549d5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
@@ -67,7 +67,7 @@ func CastBACnetErrorAtomicReadFile(structType interface{}) BACnetErrorAtomicRead
 }
 
 func (m BACnetErrorAtomicReadFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
index 85a66ab..97b31fe 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
@@ -67,7 +67,7 @@ func CastBACnetErrorAtomicWriteFile(structType interface{}) BACnetErrorAtomicWri
 }
 
 func (m BACnetErrorAtomicWriteFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
index 7683016..d583d0e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
@@ -67,7 +67,7 @@ func CastBACnetErrorConfirmedPrivateTransfer(structType interface{}) BACnetError
 }
 
 func (m BACnetErrorConfirmedPrivateTransfer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
index 6da48c5..42e676b 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
@@ -67,7 +67,7 @@ func CastBACnetErrorCreateObject(structType interface{}) BACnetErrorCreateObject
 }
 
 func (m BACnetErrorCreateObject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
index 383060c..c36fdd7 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
@@ -67,7 +67,7 @@ func CastBACnetErrorGetAlarmSummary(structType interface{}) BACnetErrorGetAlarmS
 }
 
 func (m BACnetErrorGetAlarmSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
index 3135b7d..a898273 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
@@ -67,7 +67,7 @@ func CastBACnetErrorGetEnrollmentSummary(structType interface{}) BACnetErrorGetE
 }
 
 func (m BACnetErrorGetEnrollmentSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
index e187468..3c72c60 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
@@ -67,7 +67,7 @@ func CastBACnetErrorGetEventInformation(structType interface{}) BACnetErrorGetEv
 }
 
 func (m BACnetErrorGetEventInformation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
index 08463ac..32c8334 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
@@ -77,7 +77,7 @@ func CastBACnetErrorReadProperty(structType interface{}) BACnetErrorReadProperty
 }
 
 func (m BACnetErrorReadProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	// Const Field (errorClassHeader)
 	lengthInBits += 5
@@ -179,7 +179,7 @@ func (m BACnetErrorReadProperty) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (errorClassLength)
 		errorClassLength := uint8(m.ErrorClassLength)
-		_errorClassLengthErr := io.WriteUint8(3, (errorClassLength))
+		_errorClassLengthErr := io.WriteUint8(3, errorClassLength)
 		if _errorClassLengthErr != nil {
 			return errors.New("Error serializing 'errorClassLength' field " + _errorClassLengthErr.Error())
 		}
@@ -202,7 +202,7 @@ func (m BACnetErrorReadProperty) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (errorCodeLength)
 		errorCodeLength := uint8(m.ErrorCodeLength)
-		_errorCodeLengthErr := io.WriteUint8(3, (errorCodeLength))
+		_errorCodeLengthErr := io.WriteUint8(3, errorCodeLength)
 		if _errorCodeLengthErr != nil {
 			return errors.New("Error serializing 'errorCodeLength' field " + _errorCodeLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
index ed35cb5..d218cfe 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetErrorReadPropertyMultiple(structType interface{}) BACnetErrorRead
 }
 
 func (m BACnetErrorReadPropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
index 75b1ab8..a30344d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
@@ -67,7 +67,7 @@ func CastBACnetErrorReadRange(structType interface{}) BACnetErrorReadRange {
 }
 
 func (m BACnetErrorReadRange) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
index 5de2a36..41dd5a6 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
@@ -67,7 +67,7 @@ func CastBACnetErrorRemovedAuthenticate(structType interface{}) BACnetErrorRemov
 }
 
 func (m BACnetErrorRemovedAuthenticate) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
index 234f78b..d2b83b2 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
@@ -67,7 +67,7 @@ func CastBACnetErrorRemovedReadPropertyConditional(structType interface{}) BACne
 }
 
 func (m BACnetErrorRemovedReadPropertyConditional) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
index d3a9097..8b49f4f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
@@ -67,7 +67,7 @@ func CastBACnetErrorVTData(structType interface{}) BACnetErrorVTData {
 }
 
 func (m BACnetErrorVTData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
index 00893be..f9bfd87 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
@@ -67,7 +67,7 @@ func CastBACnetErrorVTOpen(structType interface{}) BACnetErrorVTOpen {
 }
 
 func (m BACnetErrorVTOpen) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetError.LengthInBits()
+	var lengthInBits = m.BACnetError.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
index 8c3dc44..b47ea4e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
@@ -130,7 +130,7 @@ func BACnetServiceAckSerialize(io spi.WriteBuffer, m BACnetServiceAck, i IBACnet
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
 	serviceChoice := uint8(i.ServiceChoice())
-	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 	if _serviceChoiceErr != nil {
 		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
index 1ebb8dc..b80e2ed 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckAtomicReadFile(structType interface{}) BACnetServiceAck
 }
 
 func (m BACnetServiceAckAtomicReadFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index 95f9844..4fcb9c8 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckAtomicWriteFile(structType interface{}) BACnetServiceAc
 }
 
 func (m BACnetServiceAckAtomicWriteFile) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
index 85f4987..31a7932 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckConfirmedPrivateTransfer(structType interface{}) BACnet
 }
 
 func (m BACnetServiceAckConfirmedPrivateTransfer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
index 5abb68b..31bb2d1 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckCreateObject(structType interface{}) BACnetServiceAckCr
 }
 
 func (m BACnetServiceAckCreateObject) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
index 0c417f0..a210a9f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckGetAlarmSummary(structType interface{}) BACnetServiceAc
 }
 
 func (m BACnetServiceAckGetAlarmSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
index ff5b088..72860db 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckGetEnrollmentSummary(structType interface{}) BACnetServ
 }
 
 func (m BACnetServiceAckGetEnrollmentSummary) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
index d9ec94d..41cf8da 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckGetEventInformation(structType interface{}) BACnetServi
 }
 
 func (m BACnetServiceAckGetEventInformation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index 0005a0d..2726c93 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -81,7 +81,7 @@ func CastBACnetServiceAckReadProperty(structType interface{}) BACnetServiceAckRe
 }
 
 func (m BACnetServiceAckReadProperty) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	// Const Field (objectIdentifierHeader)
 	lengthInBits += 8
@@ -213,14 +213,14 @@ func (m BACnetServiceAckReadProperty) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (objectType)
 		objectType := uint16(m.ObjectType)
-		_objectTypeErr := io.WriteUint16(10, (objectType))
+		_objectTypeErr := io.WriteUint16(10, objectType)
 		if _objectTypeErr != nil {
 			return errors.New("Error serializing 'objectType' field " + _objectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstanceNumber)
 		objectInstanceNumber := uint32(m.ObjectInstanceNumber)
-		_objectInstanceNumberErr := io.WriteUint32(22, (objectInstanceNumber))
+		_objectInstanceNumberErr := io.WriteUint32(22, objectInstanceNumber)
 		if _objectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'objectInstanceNumber' field " + _objectInstanceNumberErr.Error())
 		}
@@ -233,7 +233,7 @@ func (m BACnetServiceAckReadProperty) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (propertyIdentifierLength)
 		propertyIdentifierLength := uint8(m.PropertyIdentifierLength)
-		_propertyIdentifierLengthErr := io.WriteUint8(3, (propertyIdentifierLength))
+		_propertyIdentifierLengthErr := io.WriteUint8(3, propertyIdentifierLength)
 		if _propertyIdentifierLengthErr != nil {
 			return errors.New("Error serializing 'propertyIdentifierLength' field " + _propertyIdentifierLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
index fa9e994..077f9ac 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckReadPropertyMultiple(structType interface{}) BACnetServ
 }
 
 func (m BACnetServiceAckReadPropertyMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
index e79084b..2bade85 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckReadRange(structType interface{}) BACnetServiceAckReadR
 }
 
 func (m BACnetServiceAckReadRange) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
index ba77ff4..8438160 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckRemovedAuthenticate(structType interface{}) BACnetServi
 }
 
 func (m BACnetServiceAckRemovedAuthenticate) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
index abc3714..ae4b9e4 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckRemovedReadPropertyConditional(structType interface{})
 }
 
 func (m BACnetServiceAckRemovedReadPropertyConditional) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
index 1c9181a..f2f9bfc 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckVTData(structType interface{}) BACnetServiceAckVTData {
 }
 
 func (m BACnetServiceAckVTData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
index dddce6e..c0d5a5d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
@@ -67,7 +67,7 @@ func CastBACnetServiceAckVTOpen(structType interface{}) BACnetServiceAckVTOpen {
 }
 
 func (m BACnetServiceAckVTOpen) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetServiceAck.LengthInBits()
+	var lengthInBits = m.BACnetServiceAck.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTag.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTag.go
index d7e2543..9cc2ec6 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTag.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTag.go
@@ -184,21 +184,21 @@ func BACnetTagSerialize(io spi.WriteBuffer, m BACnetTag, i IBACnetTag, childSeri
 
 	// Simple Field (typeOrTagNumber)
 	typeOrTagNumber := uint8(m.TypeOrTagNumber)
-	_typeOrTagNumberErr := io.WriteUint8(4, (typeOrTagNumber))
+	_typeOrTagNumberErr := io.WriteUint8(4, typeOrTagNumber)
 	if _typeOrTagNumberErr != nil {
 		return errors.New("Error serializing 'typeOrTagNumber' field " + _typeOrTagNumberErr.Error())
 	}
 
 	// Discriminator Field (contextSpecificTag) (Used as input to a switch field)
 	contextSpecificTag := uint8(i.ContextSpecificTag())
-	_contextSpecificTagErr := io.WriteUint8(1, (contextSpecificTag))
+	_contextSpecificTagErr := io.WriteUint8(1, contextSpecificTag)
 	if _contextSpecificTagErr != nil {
 		return errors.New("Error serializing 'contextSpecificTag' field " + _contextSpecificTagErr.Error())
 	}
 
 	// Simple Field (lengthValueType)
 	lengthValueType := uint8(m.LengthValueType)
-	_lengthValueTypeErr := io.WriteUint8(3, (lengthValueType))
+	_lengthValueTypeErr := io.WriteUint8(3, lengthValueType)
 	if _lengthValueTypeErr != nil {
 		return errors.New("Error serializing 'lengthValueType' field " + _lengthValueTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
index cca75bb..bc85a2c 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
@@ -74,7 +74,7 @@ func CastBACnetTagApplicationBitString(structType interface{}) BACnetTagApplicat
 }
 
 func (m BACnetTagApplicationBitString) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Simple field (unusedBits)
 	lengthInBits += 8
@@ -121,7 +121,7 @@ func (m BACnetTagApplicationBitString) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (unusedBits)
 		unusedBits := uint8(m.UnusedBits)
-		_unusedBitsErr := io.WriteUint8(8, (unusedBits))
+		_unusedBitsErr := io.WriteUint8(8, unusedBits)
 		if _unusedBitsErr != nil {
 			return errors.New("Error serializing 'unusedBits' field " + _unusedBitsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBoolean.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBoolean.go
index 110f021..a20a1c5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBoolean.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBoolean.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationBoolean(structType interface{}) BACnetTagApplicatio
 }
 
 func (m BACnetTagApplicationBoolean) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationCharacterString.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationCharacterString.go
index da14aa1..cfc1892 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationCharacterString.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationCharacterString.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationCharacterString(structType interface{}) BACnetTagAp
 }
 
 func (m BACnetTagApplicationCharacterString) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDate.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDate.go
index ef7a14b..994a3b7 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDate.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDate.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationDate(structType interface{}) BACnetTagApplicationDa
 }
 
 func (m BACnetTagApplicationDate) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
index 87305f0..21c46e5 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
@@ -73,7 +73,7 @@ func CastBACnetTagApplicationDouble(structType interface{}) BACnetTagApplication
 }
 
 func (m BACnetTagApplicationDouble) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Simple field (value)
 	lengthInBits += 64
@@ -102,7 +102,7 @@ func (m BACnetTagApplicationDouble) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (value)
 		value := float64(m.Value)
-		_valueErr := io.WriteFloat64(64, (value))
+		_valueErr := io.WriteFloat64(64, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
index 6ce6624..dde4a29 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
@@ -73,7 +73,7 @@ func CastBACnetTagApplicationEnumerated(structType interface{}) BACnetTagApplica
 }
 
 func (m BACnetTagApplicationEnumerated) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Array field
 	if len(m.Data) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationNull.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationNull.go
index ede1349..28f68cf 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationNull.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationNull.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationNull(structType interface{}) BACnetTagApplicationNu
 }
 
 func (m BACnetTagApplicationNull) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationObjectIdentifier.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationObjectIdentifier.go
index 2ee5ff2..cf33030 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationObjectIdentifier.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationObjectIdentifier.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationObjectIdentifier(structType interface{}) BACnetTagA
 }
 
 func (m BACnetTagApplicationObjectIdentifier) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationOctetString.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationOctetString.go
index d2a49d6..0a04bf6 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationOctetString.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationOctetString.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationOctetString(structType interface{}) BACnetTagApplic
 }
 
 func (m BACnetTagApplicationOctetString) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
index 1c02f9c..e9bcf1d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
@@ -73,7 +73,7 @@ func CastBACnetTagApplicationReal(structType interface{}) BACnetTagApplicationRe
 }
 
 func (m BACnetTagApplicationReal) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Simple field (value)
 	lengthInBits += 32
@@ -102,7 +102,7 @@ func (m BACnetTagApplicationReal) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (value)
 		value := float32(m.Value)
-		_valueErr := io.WriteFloat32(32, (value))
+		_valueErr := io.WriteFloat32(32, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
index 9d47d6d..f961670 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
@@ -73,7 +73,7 @@ func CastBACnetTagApplicationSignedInteger(structType interface{}) BACnetTagAppl
 }
 
 func (m BACnetTagApplicationSignedInteger) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Array field
 	if len(m.Data) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationTime.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationTime.go
index fb60560..32db30f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationTime.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationTime.go
@@ -71,7 +71,7 @@ func CastBACnetTagApplicationTime(structType interface{}) BACnetTagApplicationTi
 }
 
 func (m BACnetTagApplicationTime) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
index 67e5e41..3560635 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
@@ -73,7 +73,7 @@ func CastBACnetTagApplicationUnsignedInteger(structType interface{}) BACnetTagAp
 }
 
 func (m BACnetTagApplicationUnsignedInteger) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Array field
 	if len(m.Data) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
index 08c8282..b713eed 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
@@ -73,7 +73,7 @@ func CastBACnetTagContext(structType interface{}) BACnetTagContext {
 }
 
 func (m BACnetTagContext) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetTag.LengthInBits()
+	var lengthInBits = m.BACnetTag.LengthInBits()
 
 	// Array field
 	if len(m.Data) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagWithContent.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagWithContent.go
index 24a6df8..09c6fde 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagWithContent.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagWithContent.go
@@ -158,7 +158,7 @@ func BACnetTagWithContentParse(io *spi.ReadBuffer) (spi.Message, error) {
 	// Array field (propertyIdentifier)
 	// Length array
 	propertyIdentifier := make([]uint8, 0)
-	_propertyIdentifierLength := spi.InlineIf(bool(bool((lengthValueType) == (5))), uint16((*extLength)), uint16(lengthValueType))
+	_propertyIdentifierLength := spi.InlineIf(bool(bool((lengthValueType) == (5))), uint16(*extLength), uint16(lengthValueType))
 	_propertyIdentifierEndPos := io.GetPos() + uint16(_propertyIdentifierLength)
 	for io.GetPos() < _propertyIdentifierEndPos {
 		_item, _err := io.ReadUint8(8)
@@ -205,21 +205,21 @@ func (m BACnetTagWithContent) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (typeOrTagNumber)
 	typeOrTagNumber := uint8(m.TypeOrTagNumber)
-	_typeOrTagNumberErr := io.WriteUint8(4, (typeOrTagNumber))
+	_typeOrTagNumberErr := io.WriteUint8(4, typeOrTagNumber)
 	if _typeOrTagNumberErr != nil {
 		return errors.New("Error serializing 'typeOrTagNumber' field " + _typeOrTagNumberErr.Error())
 	}
 
 	// Simple Field (contextSpecificTag)
 	contextSpecificTag := uint8(m.ContextSpecificTag)
-	_contextSpecificTagErr := io.WriteUint8(1, (contextSpecificTag))
+	_contextSpecificTagErr := io.WriteUint8(1, contextSpecificTag)
 	if _contextSpecificTagErr != nil {
 		return errors.New("Error serializing 'contextSpecificTag' field " + _contextSpecificTagErr.Error())
 	}
 
 	// Simple Field (lengthValueType)
 	lengthValueType := uint8(m.LengthValueType)
-	_lengthValueTypeErr := io.WriteUint8(3, (lengthValueType))
+	_lengthValueTypeErr := io.WriteUint8(3, lengthValueType)
 	if _lengthValueTypeErr != nil {
 		return errors.New("Error serializing 'lengthValueType' field " + _lengthValueTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
index e121e45..aa1ad6e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
@@ -126,7 +126,7 @@ func BACnetUnconfirmedServiceRequestSerialize(io spi.WriteBuffer, m BACnetUnconf
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
 	serviceChoice := uint8(i.ServiceChoice())
-	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	_serviceChoiceErr := io.WriteUint8(8, serviceChoice)
 	if _serviceChoiceErr != nil {
 		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index 2b5c8cc..e08075c 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -81,7 +81,7 @@ func CastBACnetUnconfirmedServiceRequestIAm(structType interface{}) BACnetUnconf
 }
 
 func (m BACnetUnconfirmedServiceRequestIAm) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	// Const Field (objectIdentifierHeader)
 	lengthInBits += 8
@@ -217,14 +217,14 @@ func (m BACnetUnconfirmedServiceRequestIAm) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (objectType)
 		objectType := uint16(m.ObjectType)
-		_objectTypeErr := io.WriteUint16(10, (objectType))
+		_objectTypeErr := io.WriteUint16(10, objectType)
 		if _objectTypeErr != nil {
 			return errors.New("Error serializing 'objectType' field " + _objectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstanceNumber)
 		objectInstanceNumber := uint32(m.ObjectInstanceNumber)
-		_objectInstanceNumberErr := io.WriteUint32(22, (objectInstanceNumber))
+		_objectInstanceNumberErr := io.WriteUint32(22, objectInstanceNumber)
 		if _objectInstanceNumberErr != nil {
 			return errors.New("Error serializing 'objectInstanceNumber' field " + _objectInstanceNumberErr.Error())
 		}
@@ -237,7 +237,7 @@ func (m BACnetUnconfirmedServiceRequestIAm) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (maximumApduLengthAcceptedLength)
 		maximumApduLengthAcceptedLength := uint8(m.MaximumApduLengthAcceptedLength)
-		_maximumApduLengthAcceptedLengthErr := io.WriteUint8(3, (maximumApduLengthAcceptedLength))
+		_maximumApduLengthAcceptedLengthErr := io.WriteUint8(3, maximumApduLengthAcceptedLength)
 		if _maximumApduLengthAcceptedLengthErr != nil {
 			return errors.New("Error serializing 'maximumApduLengthAcceptedLength' field " + _maximumApduLengthAcceptedLengthErr.Error())
 		}
@@ -260,7 +260,7 @@ func (m BACnetUnconfirmedServiceRequestIAm) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (segmentationSupported)
 		segmentationSupported := uint8(m.SegmentationSupported)
-		_segmentationSupportedErr := io.WriteUint8(8, (segmentationSupported))
+		_segmentationSupportedErr := io.WriteUint8(8, segmentationSupported)
 		if _segmentationSupportedErr != nil {
 			return errors.New("Error serializing 'segmentationSupported' field " + _segmentationSupportedErr.Error())
 		}
@@ -273,7 +273,7 @@ func (m BACnetUnconfirmedServiceRequestIAm) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (vendorId)
 		vendorId := uint8(m.VendorId)
-		_vendorIdErr := io.WriteUint8(8, (vendorId))
+		_vendorIdErr := io.WriteUint8(8, vendorId)
 		if _vendorIdErr != nil {
 			return errors.New("Error serializing 'vendorId' field " + _vendorIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
index 78f44c6..0687a5e 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestIHave(structType interface{}) BACnetUnco
 }
 
 func (m BACnetUnconfirmedServiceRequestIHave) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
index d54fb23..7bd0342 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestTimeSynchronization(structType interface
 }
 
 func (m BACnetUnconfirmedServiceRequestTimeSynchronization) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
index a7259f1..e295532 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestUTCTimeSynchronization(structType interf
 }
 
 func (m BACnetUnconfirmedServiceRequestUTCTimeSynchronization) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index f3ea7be..48aac0d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification(structType in
 }
 
 func (m BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
index 1de86bf..79b4f6d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple(struc
 }
 
 func (m BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
index e2e0664..230accf 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestUnconfirmedEventNotification(structType
 }
 
 func (m BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index d8762ee..f03a93d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -78,7 +78,7 @@ func CastBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer(structType in
 }
 
 func (m BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	// Const Field (vendorIdHeader)
 	lengthInBits += 8
@@ -188,7 +188,7 @@ func (m BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) Serialize(io
 
 		// Simple Field (vendorId)
 		vendorId := uint8(m.VendorId)
-		_vendorIdErr := io.WriteUint8(8, (vendorId))
+		_vendorIdErr := io.WriteUint8(8, vendorId)
 		if _vendorIdErr != nil {
 			return errors.New("Error serializing 'vendorId' field " + _vendorIdErr.Error())
 		}
@@ -201,7 +201,7 @@ func (m BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) Serialize(io
 
 		// Simple Field (serviceNumber)
 		serviceNumber := uint16(m.ServiceNumber)
-		_serviceNumberErr := io.WriteUint16(16, (serviceNumber))
+		_serviceNumberErr := io.WriteUint16(16, serviceNumber)
 		if _serviceNumberErr != nil {
 			return errors.New("Error serializing 'serviceNumber' field " + _serviceNumberErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
index b20136f..b42cc0c 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestUnconfirmedTextMessage(structType interf
 }
 
 func (m BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index 959f99f..dd381b1 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -78,7 +78,7 @@ func CastBACnetUnconfirmedServiceRequestWhoHas(structType interface{}) BACnetUnc
 }
 
 func (m BACnetUnconfirmedServiceRequestWhoHas) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	// Const Field (deviceInstanceLowLimitHeader)
 	lengthInBits += 8
@@ -194,7 +194,7 @@ func (m BACnetUnconfirmedServiceRequestWhoHas) Serialize(io spi.WriteBuffer) err
 
 		// Simple Field (deviceInstanceLowLimit)
 		deviceInstanceLowLimit := uint32(m.DeviceInstanceLowLimit)
-		_deviceInstanceLowLimitErr := io.WriteUint32(24, (deviceInstanceLowLimit))
+		_deviceInstanceLowLimitErr := io.WriteUint32(24, deviceInstanceLowLimit)
 		if _deviceInstanceLowLimitErr != nil {
 			return errors.New("Error serializing 'deviceInstanceLowLimit' field " + _deviceInstanceLowLimitErr.Error())
 		}
@@ -207,7 +207,7 @@ func (m BACnetUnconfirmedServiceRequestWhoHas) Serialize(io spi.WriteBuffer) err
 
 		// Simple Field (deviceInstanceHighLimit)
 		deviceInstanceHighLimit := uint32(m.DeviceInstanceHighLimit)
-		_deviceInstanceHighLimitErr := io.WriteUint32(24, (deviceInstanceHighLimit))
+		_deviceInstanceHighLimitErr := io.WriteUint32(24, deviceInstanceHighLimit)
 		if _deviceInstanceHighLimitErr != nil {
 			return errors.New("Error serializing 'deviceInstanceHighLimit' field " + _deviceInstanceHighLimitErr.Error())
 		}
@@ -220,14 +220,14 @@ func (m BACnetUnconfirmedServiceRequestWhoHas) Serialize(io spi.WriteBuffer) err
 
 		// Implicit Field (objectNameLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		objectNameLength := uint8(uint8(uint8(len(m.ObjectName))) + uint8(uint8(1)))
-		_objectNameLengthErr := io.WriteUint8(8, (objectNameLength))
+		_objectNameLengthErr := io.WriteUint8(8, objectNameLength)
 		if _objectNameLengthErr != nil {
 			return errors.New("Error serializing 'objectNameLength' field " + _objectNameLengthErr.Error())
 		}
 
 		// Simple Field (objectNameCharacterSet)
 		objectNameCharacterSet := uint8(m.ObjectNameCharacterSet)
-		_objectNameCharacterSetErr := io.WriteUint8(8, (objectNameCharacterSet))
+		_objectNameCharacterSetErr := io.WriteUint8(8, objectNameCharacterSet)
 		if _objectNameCharacterSetErr != nil {
 			return errors.New("Error serializing 'objectNameCharacterSet' field " + _objectNameCharacterSetErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index c69e690..2ddefc9 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -77,7 +77,7 @@ func CastBACnetUnconfirmedServiceRequestWhoIs(structType interface{}) BACnetUnco
 }
 
 func (m BACnetUnconfirmedServiceRequestWhoIs) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	// Const Field (deviceInstanceRangeLowLimitHeader)
 	lengthInBits += 5
@@ -179,7 +179,7 @@ func (m BACnetUnconfirmedServiceRequestWhoIs) Serialize(io spi.WriteBuffer) erro
 
 		// Simple Field (deviceInstanceRangeLowLimitLength)
 		deviceInstanceRangeLowLimitLength := uint8(m.DeviceInstanceRangeLowLimitLength)
-		_deviceInstanceRangeLowLimitLengthErr := io.WriteUint8(3, (deviceInstanceRangeLowLimitLength))
+		_deviceInstanceRangeLowLimitLengthErr := io.WriteUint8(3, deviceInstanceRangeLowLimitLength)
 		if _deviceInstanceRangeLowLimitLengthErr != nil {
 			return errors.New("Error serializing 'deviceInstanceRangeLowLimitLength' field " + _deviceInstanceRangeLowLimitLengthErr.Error())
 		}
@@ -202,7 +202,7 @@ func (m BACnetUnconfirmedServiceRequestWhoIs) Serialize(io spi.WriteBuffer) erro
 
 		// Simple Field (deviceInstanceRangeHighLimitLength)
 		deviceInstanceRangeHighLimitLength := uint8(m.DeviceInstanceRangeHighLimitLength)
-		_deviceInstanceRangeHighLimitLengthErr := io.WriteUint8(3, (deviceInstanceRangeHighLimitLength))
+		_deviceInstanceRangeHighLimitLengthErr := io.WriteUint8(3, deviceInstanceRangeHighLimitLength)
 		if _deviceInstanceRangeHighLimitLengthErr != nil {
 			return errors.New("Error serializing 'deviceInstanceRangeHighLimitLength' field " + _deviceInstanceRangeHighLimitLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
index 8e5a704..d303c01 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
@@ -67,7 +67,7 @@ func CastBACnetUnconfirmedServiceRequestWriteGroup(structType interface{}) BACne
 }
 
 func (m BACnetUnconfirmedServiceRequestWriteGroup) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BACnetUnconfirmedServiceRequest.LengthInBits()
+	var lengthInBits = m.BACnetUnconfirmedServiceRequest.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
index 1bc2088..32d318d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
@@ -159,14 +159,14 @@ func BVLCSerialize(io spi.WriteBuffer, m BVLC, i IBVLC, childSerialize func() er
 
 	// Discriminator Field (bvlcFunction) (Used as input to a switch field)
 	bvlcFunction := uint8(i.BvlcFunction())
-	_bvlcFunctionErr := io.WriteUint8(8, (bvlcFunction))
+	_bvlcFunctionErr := io.WriteUint8(8, bvlcFunction)
 	if _bvlcFunctionErr != nil {
 		return errors.New("Error serializing 'bvlcFunction' field " + _bvlcFunctionErr.Error())
 	}
 
 	// Implicit Field (bvlcLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	bvlcLength := uint16(uint16(m.LengthInBytes()))
-	_bvlcLengthErr := io.WriteUint16(16, (bvlcLength))
+	_bvlcLengthErr := io.WriteUint16(16, bvlcLength)
 	if _bvlcLengthErr != nil {
 		return errors.New("Error serializing 'bvlcLength' field " + _bvlcLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
index 8d3bbac..567b11f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
@@ -67,7 +67,7 @@ func CastBVLCDeleteForeignDeviceTableEntry(structType interface{}) BVLCDeleteFor
 }
 
 func (m BVLCDeleteForeignDeviceTableEntry) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
index 8a4ee23..22e190f 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
@@ -67,7 +67,7 @@ func CastBVLCDistributeBroadcastToNetwork(structType interface{}) BVLCDistribute
 }
 
 func (m BVLCDistributeBroadcastToNetwork) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index 2d43207..b94f9dc 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -72,7 +72,7 @@ func CastBVLCForwardedNPDU(structType interface{}) BVLCForwardedNPDU {
 }
 
 func (m BVLCForwardedNPDU) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	// Array field
 	if len(m.Ip) > 0 {
@@ -142,7 +142,7 @@ func (m BVLCForwardedNPDU) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (port)
 		port := uint16(m.Port)
-		_portErr := io.WriteUint16(16, (port))
+		_portErr := io.WriteUint16(16, port)
 		if _portErr != nil {
 			return errors.New("Error serializing 'port' field " + _portErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index cedcc18..a76c85d 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -70,7 +70,7 @@ func CastBVLCOriginalBroadcastNPDU(structType interface{}) BVLCOriginalBroadcast
 }
 
 func (m BVLCOriginalBroadcastNPDU) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	// Simple field (npdu)
 	lengthInBits += m.Npdu.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index 5955bdf..6de7d1b 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -70,7 +70,7 @@ func CastBVLCOriginalUnicastNPDU(structType interface{}) BVLCOriginalUnicastNPDU
 }
 
 func (m BVLCOriginalUnicastNPDU) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	// Simple field (npdu)
 	lengthInBits += m.Npdu.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
index a79e221..e9c8d73 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
@@ -67,7 +67,7 @@ func CastBVLCReadBroadcastDistributionTable(structType interface{}) BVLCReadBroa
 }
 
 func (m BVLCReadBroadcastDistributionTable) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
index e54023b..3d59f36 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
@@ -67,7 +67,7 @@ func CastBVLCReadBroadcastDistributionTableAck(structType interface{}) BVLCReadB
 }
 
 func (m BVLCReadBroadcastDistributionTableAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
index 5b38ee5..6537ef0 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
@@ -67,7 +67,7 @@ func CastBVLCReadForeignDeviceTable(structType interface{}) BVLCReadForeignDevic
 }
 
 func (m BVLCReadForeignDeviceTable) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
index f140e1e..c4a4529 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
@@ -67,7 +67,7 @@ func CastBVLCReadForeignDeviceTableAck(structType interface{}) BVLCReadForeignDe
 }
 
 func (m BVLCReadForeignDeviceTableAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
index 63e9251..92e393b 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
@@ -67,7 +67,7 @@ func CastBVLCRegisterForeignDevice(structType interface{}) BVLCRegisterForeignDe
 }
 
 func (m BVLCRegisterForeignDevice) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
index aa21b00..bd97fa1 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
@@ -67,7 +67,7 @@ func CastBVLCResult(structType interface{}) BVLCResult {
 }
 
 func (m BVLCResult) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
index 7ba36a9..0e90d63 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
@@ -67,7 +67,7 @@ func CastBVLCSecureBVLL(structType interface{}) BVLCSecureBVLL {
 }
 
 func (m BVLCSecureBVLL) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWideBroadcastDistributionTable.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWideBroadcastDistributionTable.go
index 31d29ca..0834095 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWideBroadcastDistributionTable.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWideBroadcastDistributionTable.go
@@ -67,7 +67,7 @@ func CastBVLCWideBroadcastDistributionTable(structType interface{}) BVLCWideBroa
 }
 
 func (m BVLCWideBroadcastDistributionTable) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.BVLC.LengthInBits()
+	var lengthInBits = m.BVLC.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
index e70bafc..bfd5c98 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
@@ -123,7 +123,7 @@ func NLMSerialize(io spi.WriteBuffer, m NLM, i INLM, childSerialize func() error
 
 	// Discriminator Field (messageType) (Used as input to a switch field)
 	messageType := uint8(i.MessageType())
-	_messageTypeErr := io.WriteUint8(8, (messageType))
+	_messageTypeErr := io.WriteUint8(8, messageType)
 	if _messageTypeErr != nil {
 		return errors.New("Error serializing 'messageType' field " + _messageTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index 19e8f7b..8700170 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -70,7 +70,7 @@ func CastNLMIAmRouterToNetwork(structType interface{}) NLMIAmRouterToNetwork {
 }
 
 func (m NLMIAmRouterToNetwork) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.NLM.LengthInBits()
+	var lengthInBits = m.NLM.LengthInBits()
 
 	// Array field
 	if len(m.DestinationNetworkAddress) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index dce8fe8..bfccc22 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -70,7 +70,7 @@ func CastNLMWhoIsRouterToNetwork(structType interface{}) NLMWhoIsRouterToNetwork
 }
 
 func (m NLMWhoIsRouterToNetwork) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.NLM.LengthInBits()
+	var lengthInBits = m.NLM.LengthInBits()
 
 	// Array field
 	if len(m.DestinationNetworkAddress) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
index 14dc9a7..0fe336a 100644
--- a/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
+++ b/sandbox/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
@@ -243,8 +243,8 @@ func NPDUParse(io *spi.ReadBuffer, npduLength uint16) (spi.Message, error) {
 
 	// Array field (destinationAddress)
 	// Count array
-	destinationAddress := make([]uint8, spi.InlineIf(destinationSpecified, uint16((*destinationLength)), uint16(uint16(0))))
-	for curItem := uint16(0); curItem < uint16(spi.InlineIf(destinationSpecified, uint16((*destinationLength)), uint16(uint16(0)))); curItem++ {
+	destinationAddress := make([]uint8, spi.InlineIf(destinationSpecified, uint16(*destinationLength), uint16(uint16(0))))
+	for curItem := uint16(0); curItem < uint16(spi.InlineIf(destinationSpecified, uint16(*destinationLength), uint16(uint16(0)))); curItem++ {
 
 		_item, _err := io.ReadUint8(8)
 		if _err != nil {
@@ -277,8 +277,8 @@ func NPDUParse(io *spi.ReadBuffer, npduLength uint16) (spi.Message, error) {
 
 	// Array field (sourceAddress)
 	// Count array
-	sourceAddress := make([]uint8, spi.InlineIf(sourceSpecified, uint16((*sourceLength)), uint16(uint16(0))))
-	for curItem := uint16(0); curItem < uint16(spi.InlineIf(sourceSpecified, uint16((*sourceLength)), uint16(uint16(0)))); curItem++ {
+	sourceAddress := make([]uint8, spi.InlineIf(sourceSpecified, uint16(*sourceLength), uint16(uint16(0))))
+	for curItem := uint16(0); curItem < uint16(spi.InlineIf(sourceSpecified, uint16(*sourceLength), uint16(uint16(0)))); curItem++ {
 
 		_item, _err := io.ReadUint8(8)
 		if _err != nil {
@@ -301,7 +301,7 @@ func NPDUParse(io *spi.ReadBuffer, npduLength uint16) (spi.Message, error) {
 	// Optional Field (nlm) (Can be skipped, if a given expression evaluates to false)
 	var nlm *INLM = nil
 	if messageTypeFieldPresent {
-		_message, _err := NLMParse(io, uint16(npduLength)-uint16(uint16(uint16(uint16(uint16(uint16(2))+uint16(uint16(spi.InlineIf(sourceSpecified, uint16(uint16(uint16(3))+uint16((*sourceLength))), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(destinationSpecified, uint16(uint16(uint16(3))+uint16((*destinationLength))), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(bool(bool(destinationSpecified) || bool(sourceSpecified)), uint16(uint16(1)), uint16(uint16(0))))))))
+		_message, _err := NLMParse(io, uint16(npduLength)-uint16(uint16(uint16(uint16(uint16(uint16(2))+uint16(uint16(spi.InlineIf(sourceSpecified, uint16(uint16(uint16(3))+uint16(*sourceLength)), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(destinationSpecified, uint16(uint16(uint16(3))+uint16(*destinationLength)), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(bool(bool(destinationSpecified) || bool(sourceSpecified)), uint16(uint16(1)), uint16(uint16(0))))))))
 		if _err != nil {
 			return nil, errors.New("Error parsing 'nlm' field " + _err.Error())
 		}
@@ -316,7 +316,7 @@ func NPDUParse(io *spi.ReadBuffer, npduLength uint16) (spi.Message, error) {
 	// Optional Field (apdu) (Can be skipped, if a given expression evaluates to false)
 	var apdu *IAPDU = nil
 	if !(messageTypeFieldPresent) {
-		_message, _err := APDUParse(io, uint16(npduLength)-uint16(uint16(uint16(uint16(uint16(uint16(2))+uint16(uint16(spi.InlineIf(sourceSpecified, uint16(uint16(uint16(3))+uint16((*sourceLength))), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(destinationSpecified, uint16(uint16(uint16(3))+uint16((*destinationLength))), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(bool(bool(destinationSpecified) || bool(sourceSpecified)), uint16(uint16(1)), uint16(uint16(0))))))))
+		_message, _err := APDUParse(io, uint16(npduLength)-uint16(uint16(uint16(uint16(uint16(uint16(2))+uint16(uint16(spi.InlineIf(sourceSpecified, uint16(uint16(uint16(3))+uint16(*sourceLength)), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(destinationSpecified, uint16(uint16(uint16(3))+uint16(*destinationLength)), uint16(uint16(0))))))+uint16(uint16(spi.InlineIf(bool(bool(destinationSpecified) || bool(sourceSpecified)), uint16(uint16(1)), uint16(uint16(0))))))))
 		if _err != nil {
 			return nil, errors.New("Error parsing 'apdu' field " + _err.Error())
 		}
@@ -336,7 +336,7 @@ func (m NPDU) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (protocolVersionNumber)
 	protocolVersionNumber := uint8(m.ProtocolVersionNumber)
-	_protocolVersionNumberErr := io.WriteUint8(8, (protocolVersionNumber))
+	_protocolVersionNumberErr := io.WriteUint8(8, protocolVersionNumber)
 	if _protocolVersionNumberErr != nil {
 		return errors.New("Error serializing 'protocolVersionNumber' field " + _protocolVersionNumberErr.Error())
 	}
@@ -387,7 +387,7 @@ func (m NPDU) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (networkPriority)
 	networkPriority := uint8(m.NetworkPriority)
-	_networkPriorityErr := io.WriteUint8(2, (networkPriority))
+	_networkPriorityErr := io.WriteUint8(2, networkPriority)
 	if _networkPriorityErr != nil {
 		return errors.New("Error serializing 'networkPriority' field " + _networkPriorityErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
index c4f423d..647dbbd 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
@@ -124,7 +124,7 @@ func CEMISerialize(io spi.WriteBuffer, m CEMI, i ICEMI, childSerialize func() er
 
 	// Discriminator Field (messageCode) (Used as input to a switch field)
 	messageCode := uint8(i.MessageCode())
-	_messageCodeErr := io.WriteUint8(8, (messageCode))
+	_messageCodeErr := io.WriteUint8(8, messageCode)
 	if _messageCodeErr != nil {
 		return errors.New("Error serializing 'messageCode' field " + _messageCodeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
index 70973a9..4ccdc11 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
@@ -106,7 +106,7 @@ func CEMIAdditionalInformationSerialize(io spi.WriteBuffer, m CEMIAdditionalInfo
 
 	// Discriminator Field (additionalInformationType) (Used as input to a switch field)
 	additionalInformationType := uint8(i.AdditionalInformationType())
-	_additionalInformationTypeErr := io.WriteUint8(8, (additionalInformationType))
+	_additionalInformationTypeErr := io.WriteUint8(8, additionalInformationType)
 	if _additionalInformationTypeErr != nil {
 		return errors.New("Error serializing 'additionalInformationType' field " + _additionalInformationTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
index 40d26af..f7c6873 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
@@ -78,7 +78,7 @@ func CastCEMIAdditionalInformationBusmonitorInfo(structType interface{}) CEMIAdd
 }
 
 func (m CEMIAdditionalInformationBusmonitorInfo) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIAdditionalInformation.LengthInBits()
+	var lengthInBits = m.CEMIAdditionalInformation.LengthInBits()
 
 	// Const Field (len)
 	lengthInBits += 8
@@ -205,7 +205,7 @@ func (m CEMIAdditionalInformationBusmonitorInfo) Serialize(io spi.WriteBuffer) e
 
 		// Simple Field (sequenceNumber)
 		sequenceNumber := uint8(m.SequenceNumber)
-		_sequenceNumberErr := io.WriteUint8(3, (sequenceNumber))
+		_sequenceNumberErr := io.WriteUint8(3, sequenceNumber)
 		if _sequenceNumberErr != nil {
 			return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
index f3049c4..8567b27 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
@@ -74,7 +74,7 @@ func CastCEMIAdditionalInformationRelativeTimestamp(structType interface{}) CEMI
 }
 
 func (m CEMIAdditionalInformationRelativeTimestamp) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIAdditionalInformation.LengthInBits()
+	var lengthInBits = m.CEMIAdditionalInformation.LengthInBits()
 
 	// Const Field (len)
 	lengthInBits += 8
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIBusmonInd.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIBusmonInd.go
index 9d1c3c3..86892d8 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIBusmonInd.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIBusmonInd.go
@@ -72,7 +72,7 @@ func CastCEMIBusmonInd(structType interface{}) CEMIBusmonInd {
 }
 
 func (m CEMIBusmonInd) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (additionalInformationLength)
 	lengthInBits += 8
@@ -140,7 +140,7 @@ func (m CEMIBusmonInd) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (additionalInformationLength)
 		additionalInformationLength := uint8(m.AdditionalInformationLength)
-		_additionalInformationLengthErr := io.WriteUint8(8, (additionalInformationLength))
+		_additionalInformationLengthErr := io.WriteUint8(8, additionalInformationLength)
 		if _additionalInformationLengthErr != nil {
 			return errors.New("Error serializing 'additionalInformationLength' field " + _additionalInformationLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataCon.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataCon.go
index d8335bd..34cdeea 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataCon.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataCon.go
@@ -72,7 +72,7 @@ func CastCEMIDataCon(structType interface{}) CEMIDataCon {
 }
 
 func (m CEMIDataCon) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (additionalInformationLength)
 	lengthInBits += 8
@@ -140,7 +140,7 @@ func (m CEMIDataCon) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (additionalInformationLength)
 		additionalInformationLength := uint8(m.AdditionalInformationLength)
-		_additionalInformationLengthErr := io.WriteUint8(8, (additionalInformationLength))
+		_additionalInformationLengthErr := io.WriteUint8(8, additionalInformationLength)
 		if _additionalInformationLengthErr != nil {
 			return errors.New("Error serializing 'additionalInformationLength' field " + _additionalInformationLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataFrame.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataFrame.go
index 8e8dbf5..ad6187f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataFrame.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataFrame.go
@@ -335,14 +335,14 @@ func (m CEMIDataFrame) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (hopCount)
 	hopCount := uint8(m.HopCount)
-	_hopCountErr := io.WriteUint8(3, (hopCount))
+	_hopCountErr := io.WriteUint8(3, hopCount)
 	if _hopCountErr != nil {
 		return errors.New("Error serializing 'hopCount' field " + _hopCountErr.Error())
 	}
 
 	// Simple Field (extendedFrameFormat)
 	extendedFrameFormat := uint8(m.ExtendedFrameFormat)
-	_extendedFrameFormatErr := io.WriteUint8(4, (extendedFrameFormat))
+	_extendedFrameFormatErr := io.WriteUint8(4, extendedFrameFormat)
 	if _extendedFrameFormatErr != nil {
 		return errors.New("Error serializing 'extendedFrameFormat' field " + _extendedFrameFormatErr.Error())
 	}
@@ -366,7 +366,7 @@ func (m CEMIDataFrame) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (dataLength)
 	dataLength := uint8(m.DataLength)
-	_dataLengthErr := io.WriteUint8(8, (dataLength))
+	_dataLengthErr := io.WriteUint8(8, dataLength)
 	if _dataLengthErr != nil {
 		return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 	}
@@ -380,7 +380,7 @@ func (m CEMIDataFrame) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (counter)
 	counter := uint8(m.Counter)
-	_counterErr := io.WriteUint8(4, (counter))
+	_counterErr := io.WriteUint8(4, counter)
 	if _counterErr != nil {
 		return errors.New("Error serializing 'counter' field " + _counterErr.Error())
 	}
@@ -394,7 +394,7 @@ func (m CEMIDataFrame) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (dataFirstByte)
 	dataFirstByte := int8(m.DataFirstByte)
-	_dataFirstByteErr := io.WriteInt8(6, (dataFirstByte))
+	_dataFirstByteErr := io.WriteInt8(6, dataFirstByte)
 	if _dataFirstByteErr != nil {
 		return errors.New("Error serializing 'dataFirstByte' field " + _dataFirstByteErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataInd.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataInd.go
index 9165e84..2ee0d2f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataInd.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataInd.go
@@ -72,7 +72,7 @@ func CastCEMIDataInd(structType interface{}) CEMIDataInd {
 }
 
 func (m CEMIDataInd) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (additionalInformationLength)
 	lengthInBits += 8
@@ -140,7 +140,7 @@ func (m CEMIDataInd) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (additionalInformationLength)
 		additionalInformationLength := uint8(m.AdditionalInformationLength)
-		_additionalInformationLengthErr := io.WriteUint8(8, (additionalInformationLength))
+		_additionalInformationLengthErr := io.WriteUint8(8, additionalInformationLength)
 		if _additionalInformationLengthErr != nil {
 			return errors.New("Error serializing 'additionalInformationLength' field " + _additionalInformationLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataReq.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataReq.go
index 66e3f44..5afe40f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataReq.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIDataReq.go
@@ -72,7 +72,7 @@ func CastCEMIDataReq(structType interface{}) CEMIDataReq {
 }
 
 func (m CEMIDataReq) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (additionalInformationLength)
 	lengthInBits += 8
@@ -140,7 +140,7 @@ func (m CEMIDataReq) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (additionalInformationLength)
 		additionalInformationLength := uint8(m.AdditionalInformationLength)
-		_additionalInformationLengthErr := io.WriteUint8(8, (additionalInformationLength))
+		_additionalInformationLengthErr := io.WriteUint8(8, additionalInformationLength)
 		if _additionalInformationLengthErr != nil {
 			return errors.New("Error serializing 'additionalInformationLength' field " + _additionalInformationLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameAck.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameAck.go
index 7197528..181edf5 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameAck.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameAck.go
@@ -79,7 +79,7 @@ func CastCEMIFrameAck(structType interface{}) CEMIFrameAck {
 }
 
 func (m CEMIFrameAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIFrame.LengthInBits()
+	var lengthInBits = m.CEMIFrame.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameData.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameData.go
index 0ba917f..d3d28ad 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameData.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameData.go
@@ -92,7 +92,7 @@ func CastCEMIFrameData(structType interface{}) CEMIFrameData {
 }
 
 func (m CEMIFrameData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIFrame.LengthInBits()
+	var lengthInBits = m.CEMIFrame.LengthInBits()
 
 	// Simple field (sourceAddress)
 	lengthInBits += m.SourceAddress.LengthInBits()
@@ -256,14 +256,14 @@ func (m CEMIFrameData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (hopCount)
 		hopCount := uint8(m.HopCount)
-		_hopCountErr := io.WriteUint8(3, (hopCount))
+		_hopCountErr := io.WriteUint8(3, hopCount)
 		if _hopCountErr != nil {
 			return errors.New("Error serializing 'hopCount' field " + _hopCountErr.Error())
 		}
 
 		// Simple Field (dataLength)
 		dataLength := uint8(m.DataLength)
-		_dataLengthErr := io.WriteUint8(4, (dataLength))
+		_dataLengthErr := io.WriteUint8(4, dataLength)
 		if _dataLengthErr != nil {
 			return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 		}
@@ -277,7 +277,7 @@ func (m CEMIFrameData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (counter)
 		counter := uint8(m.Counter)
-		_counterErr := io.WriteUint8(4, (counter))
+		_counterErr := io.WriteUint8(4, counter)
 		if _counterErr != nil {
 			return errors.New("Error serializing 'counter' field " + _counterErr.Error())
 		}
@@ -291,7 +291,7 @@ func (m CEMIFrameData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (dataFirstByte)
 		dataFirstByte := int8(m.DataFirstByte)
-		_dataFirstByteErr := io.WriteInt8(6, (dataFirstByte))
+		_dataFirstByteErr := io.WriteInt8(6, dataFirstByte)
 		if _dataFirstByteErr != nil {
 			return errors.New("Error serializing 'dataFirstByte' field " + _dataFirstByteErr.Error())
 		}
@@ -308,7 +308,7 @@ func (m CEMIFrameData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (crc)
 		crc := uint8(m.Crc)
-		_crcErr := io.WriteUint8(8, (crc))
+		_crcErr := io.WriteUint8(8, crc)
 		if _crcErr != nil {
 			return errors.New("Error serializing 'crc' field " + _crcErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameDataExt.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameDataExt.go
index 1c7e8ac..8fdc396 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameDataExt.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFrameDataExt.go
@@ -93,7 +93,7 @@ func CastCEMIFrameDataExt(structType interface{}) CEMIFrameDataExt {
 }
 
 func (m CEMIFrameDataExt) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIFrame.LengthInBits()
+	var lengthInBits = m.CEMIFrame.LengthInBits()
 
 	// Simple field (groupAddress)
 	lengthInBits += 1
@@ -249,14 +249,14 @@ func (m CEMIFrameDataExt) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (hopCount)
 		hopCount := uint8(m.HopCount)
-		_hopCountErr := io.WriteUint8(3, (hopCount))
+		_hopCountErr := io.WriteUint8(3, hopCount)
 		if _hopCountErr != nil {
 			return errors.New("Error serializing 'hopCount' field " + _hopCountErr.Error())
 		}
 
 		// Simple Field (extendedFrameFormat)
 		extendedFrameFormat := uint8(m.ExtendedFrameFormat)
-		_extendedFrameFormatErr := io.WriteUint8(4, (extendedFrameFormat))
+		_extendedFrameFormatErr := io.WriteUint8(4, extendedFrameFormat)
 		if _extendedFrameFormatErr != nil {
 			return errors.New("Error serializing 'extendedFrameFormat' field " + _extendedFrameFormatErr.Error())
 		}
@@ -280,7 +280,7 @@ func (m CEMIFrameDataExt) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (dataLength)
 		dataLength := uint8(m.DataLength)
-		_dataLengthErr := io.WriteUint8(8, (dataLength))
+		_dataLengthErr := io.WriteUint8(8, dataLength)
 		if _dataLengthErr != nil {
 			return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 		}
@@ -294,7 +294,7 @@ func (m CEMIFrameDataExt) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (counter)
 		counter := uint8(m.Counter)
-		_counterErr := io.WriteUint8(4, (counter))
+		_counterErr := io.WriteUint8(4, counter)
 		if _counterErr != nil {
 			return errors.New("Error serializing 'counter' field " + _counterErr.Error())
 		}
@@ -308,7 +308,7 @@ func (m CEMIFrameDataExt) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (dataFirstByte)
 		dataFirstByte := int8(m.DataFirstByte)
-		_dataFirstByteErr := io.WriteInt8(6, (dataFirstByte))
+		_dataFirstByteErr := io.WriteInt8(6, dataFirstByte)
 		if _dataFirstByteErr != nil {
 			return errors.New("Error serializing 'dataFirstByte' field " + _dataFirstByteErr.Error())
 		}
@@ -325,7 +325,7 @@ func (m CEMIFrameDataExt) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (crc)
 		crc := uint8(m.Crc)
-		_crcErr := io.WriteUint8(8, (crc))
+		_crcErr := io.WriteUint8(8, crc)
 		if _crcErr != nil {
 			return errors.New("Error serializing 'crc' field " + _crcErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingData.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingData.go
index 783b60a..0dc542b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingData.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingData.go
@@ -79,7 +79,7 @@ func CastCEMIFramePollingData(structType interface{}) CEMIFramePollingData {
 }
 
 func (m CEMIFramePollingData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIFrame.LengthInBits()
+	var lengthInBits = m.CEMIFrame.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingDataExt.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingDataExt.go
index 8579b39..cf14c35 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingDataExt.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIFramePollingDataExt.go
@@ -79,7 +79,7 @@ func CastCEMIFramePollingDataExt(structType interface{}) CEMIFramePollingDataExt
 }
 
 func (m CEMIFramePollingDataExt) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMIFrame.LengthInBits()
+	var lengthInBits = m.CEMIFrame.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadCon.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadCon.go
index 24501ff..8162b11 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadCon.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadCon.go
@@ -74,7 +74,7 @@ func CastCEMIMPropReadCon(structType interface{}) CEMIMPropReadCon {
 }
 
 func (m CEMIMPropReadCon) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (interfaceObjectType)
 	lengthInBits += 16
@@ -148,42 +148,42 @@ func (m CEMIMPropReadCon) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (interfaceObjectType)
 		interfaceObjectType := uint16(m.InterfaceObjectType)
-		_interfaceObjectTypeErr := io.WriteUint16(16, (interfaceObjectType))
+		_interfaceObjectTypeErr := io.WriteUint16(16, interfaceObjectType)
 		if _interfaceObjectTypeErr != nil {
 			return errors.New("Error serializing 'interfaceObjectType' field " + _interfaceObjectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstance)
 		objectInstance := uint8(m.ObjectInstance)
-		_objectInstanceErr := io.WriteUint8(8, (objectInstance))
+		_objectInstanceErr := io.WriteUint8(8, objectInstance)
 		if _objectInstanceErr != nil {
 			return errors.New("Error serializing 'objectInstance' field " + _objectInstanceErr.Error())
 		}
 
 		// Simple Field (propertyId)
 		propertyId := uint8(m.PropertyId)
-		_propertyIdErr := io.WriteUint8(8, (propertyId))
+		_propertyIdErr := io.WriteUint8(8, propertyId)
 		if _propertyIdErr != nil {
 			return errors.New("Error serializing 'propertyId' field " + _propertyIdErr.Error())
 		}
 
 		// Simple Field (numberOfElements)
 		numberOfElements := uint8(m.NumberOfElements)
-		_numberOfElementsErr := io.WriteUint8(4, (numberOfElements))
+		_numberOfElementsErr := io.WriteUint8(4, numberOfElements)
 		if _numberOfElementsErr != nil {
 			return errors.New("Error serializing 'numberOfElements' field " + _numberOfElementsErr.Error())
 		}
 
 		// Simple Field (startIndex)
 		startIndex := uint16(m.StartIndex)
-		_startIndexErr := io.WriteUint16(12, (startIndex))
+		_startIndexErr := io.WriteUint16(12, startIndex)
 		if _startIndexErr != nil {
 			return errors.New("Error serializing 'startIndex' field " + _startIndexErr.Error())
 		}
 
 		// Simple Field (unknown)
 		unknown := uint16(m.Unknown)
-		_unknownErr := io.WriteUint16(16, (unknown))
+		_unknownErr := io.WriteUint16(16, unknown)
 		if _unknownErr != nil {
 			return errors.New("Error serializing 'unknown' field " + _unknownErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadReq.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadReq.go
index 705e23a..ce49e0f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadReq.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIMPropReadReq.go
@@ -73,7 +73,7 @@ func CastCEMIMPropReadReq(structType interface{}) CEMIMPropReadReq {
 }
 
 func (m CEMIMPropReadReq) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	// Simple field (interfaceObjectType)
 	lengthInBits += 16
@@ -138,35 +138,35 @@ func (m CEMIMPropReadReq) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (interfaceObjectType)
 		interfaceObjectType := uint16(m.InterfaceObjectType)
-		_interfaceObjectTypeErr := io.WriteUint16(16, (interfaceObjectType))
+		_interfaceObjectTypeErr := io.WriteUint16(16, interfaceObjectType)
 		if _interfaceObjectTypeErr != nil {
 			return errors.New("Error serializing 'interfaceObjectType' field " + _interfaceObjectTypeErr.Error())
 		}
 
 		// Simple Field (objectInstance)
 		objectInstance := uint8(m.ObjectInstance)
-		_objectInstanceErr := io.WriteUint8(8, (objectInstance))
+		_objectInstanceErr := io.WriteUint8(8, objectInstance)
 		if _objectInstanceErr != nil {
 			return errors.New("Error serializing 'objectInstance' field " + _objectInstanceErr.Error())
 		}
 
 		// Simple Field (propertyId)
 		propertyId := uint8(m.PropertyId)
-		_propertyIdErr := io.WriteUint8(8, (propertyId))
+		_propertyIdErr := io.WriteUint8(8, propertyId)
 		if _propertyIdErr != nil {
 			return errors.New("Error serializing 'propertyId' field " + _propertyIdErr.Error())
 		}
 
 		// Simple Field (numberOfElements)
 		numberOfElements := uint8(m.NumberOfElements)
-		_numberOfElementsErr := io.WriteUint8(4, (numberOfElements))
+		_numberOfElementsErr := io.WriteUint8(4, numberOfElements)
 		if _numberOfElementsErr != nil {
 			return errors.New("Error serializing 'numberOfElements' field " + _numberOfElementsErr.Error())
 		}
 
 		// Simple Field (startIndex)
 		startIndex := uint16(m.StartIndex)
-		_startIndexErr := io.WriteUint16(12, (startIndex))
+		_startIndexErr := io.WriteUint16(12, startIndex)
 		if _startIndexErr != nil {
 			return errors.New("Error serializing 'startIndex' field " + _startIndexErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataCon.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataCon.go
index 6fb36b4..8330338 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataCon.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataCon.go
@@ -67,7 +67,7 @@ func CastCEMIPollDataCon(structType interface{}) CEMIPollDataCon {
 }
 
 func (m CEMIPollDataCon) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataReq.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataReq.go
index ba26d4b..6fcda7d 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataReq.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIPollDataReq.go
@@ -67,7 +67,7 @@ func CastCEMIPollDataReq(structType interface{}) CEMIPollDataReq {
 }
 
 func (m CEMIPollDataReq) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawCon.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawCon.go
index 31e7ef4..d7e0c2b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawCon.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawCon.go
@@ -67,7 +67,7 @@ func CastCEMIRawCon(structType interface{}) CEMIRawCon {
 }
 
 func (m CEMIRawCon) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawInd.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawInd.go
index b436dbe..83a15ac 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawInd.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawInd.go
@@ -67,7 +67,7 @@ func CastCEMIRawInd(structType interface{}) CEMIRawInd {
 }
 
 func (m CEMIRawInd) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawReq.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawReq.go
index 8f92ea5..5a92011 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawReq.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIRawReq.go
@@ -67,7 +67,7 @@ func CastCEMIRawReq(structType interface{}) CEMIRawReq {
 }
 
 func (m CEMIRawReq) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.CEMI.LengthInBits()
+	var lengthInBits = m.CEMI.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
index cdea3d6..ae22875 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
@@ -72,7 +72,7 @@ func CastConnectionRequest(structType interface{}) ConnectionRequest {
 }
 
 func (m ConnectionRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (hpaiDiscoveryEndpoint)
 	lengthInBits += m.HpaiDiscoveryEndpoint.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
index 0fecad4..bdb4622 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
@@ -115,14 +115,14 @@ func ConnectionRequestInformationSerialize(io spi.WriteBuffer, m ConnectionReque
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Discriminator Field (connectionType) (Used as input to a switch field)
 	connectionType := uint8(i.ConnectionType())
-	_connectionTypeErr := io.WriteUint8(8, (connectionType))
+	_connectionTypeErr := io.WriteUint8(8, connectionType)
 	if _connectionTypeErr != nil {
 		return errors.New("Error serializing 'connectionType' field " + _connectionTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
index d296d6c..303aa14 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
@@ -67,7 +67,7 @@ func CastConnectionRequestInformationDeviceManagement(structType interface{}) Co
 }
 
 func (m ConnectionRequestInformationDeviceManagement) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ConnectionRequestInformation.LengthInBits()
+	var lengthInBits = m.ConnectionRequestInformation.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
index a670b41..01e7cec 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
@@ -70,7 +70,7 @@ func CastConnectionRequestInformationTunnelConnection(structType interface{}) Co
 }
 
 func (m ConnectionRequestInformationTunnelConnection) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ConnectionRequestInformation.LengthInBits()
+	var lengthInBits = m.ConnectionRequestInformation.LengthInBits()
 
 	// Enum Field (knxLayer)
 	lengthInBits += 8
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
index b3d8b64..b3d0aad 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
@@ -73,7 +73,7 @@ func CastConnectionResponse(structType interface{}) ConnectionResponse {
 }
 
 func (m ConnectionResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (communicationChannelId)
 	lengthInBits += 8
@@ -151,7 +151,7 @@ func (m ConnectionResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (communicationChannelId)
 		communicationChannelId := uint8(m.CommunicationChannelId)
-		_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+		_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 		if _communicationChannelIdErr != nil {
 			return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
index ad0701a..3ff77f5 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
@@ -115,14 +115,14 @@ func ConnectionResponseDataBlockSerialize(io spi.WriteBuffer, m ConnectionRespon
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Discriminator Field (connectionType) (Used as input to a switch field)
 	connectionType := uint8(i.ConnectionType())
-	_connectionTypeErr := io.WriteUint8(8, (connectionType))
+	_connectionTypeErr := io.WriteUint8(8, connectionType)
 	if _connectionTypeErr != nil {
 		return errors.New("Error serializing 'connectionType' field " + _connectionTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
index df33ee3..e6fc3ce 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
@@ -67,7 +67,7 @@ func CastConnectionResponseDataBlockDeviceManagement(structType interface{}) Con
 }
 
 func (m ConnectionResponseDataBlockDeviceManagement) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ConnectionResponseDataBlock.LengthInBits()
+	var lengthInBits = m.ConnectionResponseDataBlock.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
index 44cecc3..b3f8f3b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
@@ -70,7 +70,7 @@ func CastConnectionResponseDataBlockTunnelConnection(structType interface{}) Con
 }
 
 func (m ConnectionResponseDataBlockTunnelConnection) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ConnectionResponseDataBlock.LengthInBits()
+	var lengthInBits = m.ConnectionResponseDataBlock.LengthInBits()
 
 	// Simple field (knxAddress)
 	lengthInBits += m.KnxAddress.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
index b9b470e..c6d029c 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
@@ -72,7 +72,7 @@ func CastConnectionStateRequest(structType interface{}) ConnectionStateRequest {
 }
 
 func (m ConnectionStateRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (communicationChannelId)
 	lengthInBits += 8
@@ -132,7 +132,7 @@ func (m ConnectionStateRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (communicationChannelId)
 		communicationChannelId := uint8(m.CommunicationChannelId)
-		_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+		_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 		if _communicationChannelIdErr != nil {
 			return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
index 96f63f7..916350a 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
@@ -70,7 +70,7 @@ func CastConnectionStateResponse(structType interface{}) ConnectionStateResponse
 }
 
 func (m ConnectionStateResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (communicationChannelId)
 	lengthInBits += 8
@@ -108,7 +108,7 @@ func (m ConnectionStateResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (communicationChannelId)
 		communicationChannelId := uint8(m.CommunicationChannelId)
-		_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+		_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 		if _communicationChannelIdErr != nil {
 			return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
index 2ab46e8..f661e3f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
@@ -218,21 +218,21 @@ func (m DIBDeviceInfo) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (descriptionType)
 	descriptionType := uint8(m.DescriptionType)
-	_descriptionTypeErr := io.WriteUint8(8, (descriptionType))
+	_descriptionTypeErr := io.WriteUint8(8, descriptionType)
 	if _descriptionTypeErr != nil {
 		return errors.New("Error serializing 'descriptionType' field " + _descriptionTypeErr.Error())
 	}
 
 	// Simple Field (knxMedium)
 	knxMedium := uint8(m.KnxMedium)
-	_knxMediumErr := io.WriteUint8(8, (knxMedium))
+	_knxMediumErr := io.WriteUint8(8, knxMedium)
 	if _knxMediumErr != nil {
 		return errors.New("Error serializing 'knxMedium' field " + _knxMediumErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
index 4e6037f..777b522 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
@@ -122,14 +122,14 @@ func (m DIBSuppSvcFamilies) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (descriptionType)
 	descriptionType := uint8(m.DescriptionType)
-	_descriptionTypeErr := io.WriteUint8(8, (descriptionType))
+	_descriptionTypeErr := io.WriteUint8(8, descriptionType)
 	if _descriptionTypeErr != nil {
 		return errors.New("Error serializing 'descriptionType' field " + _descriptionTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
index 03e0a58..6096e3f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
@@ -70,7 +70,7 @@ func CastDescriptionRequest(structType interface{}) DescriptionRequest {
 }
 
 func (m DescriptionRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (hpaiControlEndpoint)
 	lengthInBits += m.HpaiControlEndpoint.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
index 74055ed..3520a9e 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
@@ -71,7 +71,7 @@ func CastDescriptionResponse(structType interface{}) DescriptionResponse {
 }
 
 func (m DescriptionResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (dibDeviceInfo)
 	lengthInBits += m.DibDeviceInfo.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
index 3f7aaac..b044a22 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
@@ -70,7 +70,7 @@ func CastDeviceConfigurationAck(structType interface{}) DeviceConfigurationAck {
 }
 
 func (m DeviceConfigurationAck) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (deviceConfigurationAckDataBlock)
 	lengthInBits += m.DeviceConfigurationAckDataBlock.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
index fd625ca..b45615b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
@@ -116,21 +116,21 @@ func (m DeviceConfigurationAckDataBlock) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (communicationChannelId)
 	communicationChannelId := uint8(m.CommunicationChannelId)
-	_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+	_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 	if _communicationChannelIdErr != nil {
 		return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 	}
 
 	// Simple Field (sequenceCounter)
 	sequenceCounter := uint8(m.SequenceCounter)
-	_sequenceCounterErr := io.WriteUint8(8, (sequenceCounter))
+	_sequenceCounterErr := io.WriteUint8(8, sequenceCounter)
 	if _sequenceCounterErr != nil {
 		return errors.New("Error serializing 'sequenceCounter' field " + _sequenceCounterErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index be07633..7c5bbba 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -71,7 +71,7 @@ func CastDeviceConfigurationRequest(structType interface{}) DeviceConfigurationR
 }
 
 func (m DeviceConfigurationRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (deviceConfigurationRequestDataBlock)
 	lengthInBits += m.DeviceConfigurationRequestDataBlock.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
index 5d0f945..cc35c10 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
@@ -124,21 +124,21 @@ func (m DeviceConfigurationRequestDataBlock) Serialize(io spi.WriteBuffer) error
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (communicationChannelId)
 	communicationChannelId := uint8(m.CommunicationChannelId)
-	_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+	_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 	if _communicationChannelIdErr != nil {
 		return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 	}
 
 	// Simple Field (sequenceCounter)
 	sequenceCounter := uint8(m.SequenceCounter)
-	_sequenceCounterErr := io.WriteUint8(8, (sequenceCounter))
+	_sequenceCounterErr := io.WriteUint8(8, sequenceCounter)
 	if _sequenceCounterErr != nil {
 		return errors.New("Error serializing 'sequenceCounter' field " + _sequenceCounterErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
index 6fd4620..c0f4b0e 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
@@ -72,7 +72,7 @@ func CastDisconnectRequest(structType interface{}) DisconnectRequest {
 }
 
 func (m DisconnectRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (communicationChannelId)
 	lengthInBits += 8
@@ -132,7 +132,7 @@ func (m DisconnectRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (communicationChannelId)
 		communicationChannelId := uint8(m.CommunicationChannelId)
-		_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+		_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 		if _communicationChannelIdErr != nil {
 			return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
index 967c032..e4af299 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
@@ -70,7 +70,7 @@ func CastDisconnectResponse(structType interface{}) DisconnectResponse {
 }
 
 func (m DisconnectResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (communicationChannelId)
 	lengthInBits += 8
@@ -108,7 +108,7 @@ func (m DisconnectResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (communicationChannelId)
 		communicationChannelId := uint8(m.CommunicationChannelId)
-		_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+		_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 		if _communicationChannelIdErr != nil {
 			return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
index b40fac8..3b65708 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
@@ -122,7 +122,7 @@ func (m HPAIControlEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
@@ -143,7 +143,7 @@ func (m HPAIControlEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (ipPort)
 	ipPort := uint16(m.IpPort)
-	_ipPortErr := io.WriteUint16(16, (ipPort))
+	_ipPortErr := io.WriteUint16(16, ipPort)
 	if _ipPortErr != nil {
 		return errors.New("Error serializing 'ipPort' field " + _ipPortErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
index 2fd0ced..9960402 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
@@ -122,7 +122,7 @@ func (m HPAIDataEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
@@ -143,7 +143,7 @@ func (m HPAIDataEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (ipPort)
 	ipPort := uint16(m.IpPort)
-	_ipPortErr := io.WriteUint16(16, (ipPort))
+	_ipPortErr := io.WriteUint16(16, ipPort)
 	if _ipPortErr != nil {
 		return errors.New("Error serializing 'ipPort' field " + _ipPortErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
index d30b01b..14a608f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
@@ -122,7 +122,7 @@ func (m HPAIDiscoveryEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
@@ -143,7 +143,7 @@ func (m HPAIDiscoveryEndpoint) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (ipPort)
 	ipPort := uint16(m.IpPort)
-	_ipPortErr := io.WriteUint16(16, (ipPort))
+	_ipPortErr := io.WriteUint16(16, ipPort)
 	if _ipPortErr != nil {
 		return errors.New("Error serializing 'ipPort' field " + _ipPortErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXAddress.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXAddress.go
index e2a24e8..85cf0c2 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXAddress.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXAddress.go
@@ -107,21 +107,21 @@ func (m KNXAddress) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (mainGroup)
 	mainGroup := uint8(m.MainGroup)
-	_mainGroupErr := io.WriteUint8(4, (mainGroup))
+	_mainGroupErr := io.WriteUint8(4, mainGroup)
 	if _mainGroupErr != nil {
 		return errors.New("Error serializing 'mainGroup' field " + _mainGroupErr.Error())
 	}
 
 	// Simple Field (middleGroup)
 	middleGroup := uint8(m.MiddleGroup)
-	_middleGroupErr := io.WriteUint8(4, (middleGroup))
+	_middleGroupErr := io.WriteUint8(4, middleGroup)
 	if _middleGroupErr != nil {
 		return errors.New("Error serializing 'middleGroup' field " + _middleGroupErr.Error())
 	}
 
 	// Simple Field (subGroup)
 	subGroup := uint8(m.SubGroup)
-	_subGroupErr := io.WriteUint8(8, (subGroup))
+	_subGroupErr := io.WriteUint8(8, subGroup)
 	if _subGroupErr != nil {
 		return errors.New("Error serializing 'subGroup' field " + _subGroupErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress2Level.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress2Level.go
index 2d26b6d..1e2e1a4 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress2Level.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress2Level.go
@@ -70,7 +70,7 @@ func CastKNXGroupAddress2Level(structType interface{}) KNXGroupAddress2Level {
 }
 
 func (m KNXGroupAddress2Level) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXGroupAddress.LengthInBits()
+	var lengthInBits = m.KNXGroupAddress.LengthInBits()
 
 	// Simple field (mainGroup)
 	lengthInBits += 5
@@ -108,14 +108,14 @@ func (m KNXGroupAddress2Level) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (mainGroup)
 		mainGroup := uint8(m.MainGroup)
-		_mainGroupErr := io.WriteUint8(5, (mainGroup))
+		_mainGroupErr := io.WriteUint8(5, mainGroup)
 		if _mainGroupErr != nil {
 			return errors.New("Error serializing 'mainGroup' field " + _mainGroupErr.Error())
 		}
 
 		// Simple Field (subGroup)
 		subGroup := uint16(m.SubGroup)
-		_subGroupErr := io.WriteUint16(11, (subGroup))
+		_subGroupErr := io.WriteUint16(11, subGroup)
 		if _subGroupErr != nil {
 			return errors.New("Error serializing 'subGroup' field " + _subGroupErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress3Level.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress3Level.go
index 204f119..873011f 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress3Level.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddress3Level.go
@@ -71,7 +71,7 @@ func CastKNXGroupAddress3Level(structType interface{}) KNXGroupAddress3Level {
 }
 
 func (m KNXGroupAddress3Level) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXGroupAddress.LengthInBits()
+	var lengthInBits = m.KNXGroupAddress.LengthInBits()
 
 	// Simple field (mainGroup)
 	lengthInBits += 5
@@ -118,21 +118,21 @@ func (m KNXGroupAddress3Level) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (mainGroup)
 		mainGroup := uint8(m.MainGroup)
-		_mainGroupErr := io.WriteUint8(5, (mainGroup))
+		_mainGroupErr := io.WriteUint8(5, mainGroup)
 		if _mainGroupErr != nil {
 			return errors.New("Error serializing 'mainGroup' field " + _mainGroupErr.Error())
 		}
 
 		// Simple Field (middleGroup)
 		middleGroup := uint8(m.MiddleGroup)
-		_middleGroupErr := io.WriteUint8(3, (middleGroup))
+		_middleGroupErr := io.WriteUint8(3, middleGroup)
 		if _middleGroupErr != nil {
 			return errors.New("Error serializing 'middleGroup' field " + _middleGroupErr.Error())
 		}
 
 		// Simple Field (subGroup)
 		subGroup := uint8(m.SubGroup)
-		_subGroupErr := io.WriteUint8(8, (subGroup))
+		_subGroupErr := io.WriteUint8(8, subGroup)
 		if _subGroupErr != nil {
 			return errors.New("Error serializing 'subGroup' field " + _subGroupErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddressFreeLevel.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddressFreeLevel.go
index 468a124..fdb0d4b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddressFreeLevel.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXGroupAddressFreeLevel.go
@@ -69,7 +69,7 @@ func CastKNXGroupAddressFreeLevel(structType interface{}) KNXGroupAddressFreeLev
 }
 
 func (m KNXGroupAddressFreeLevel) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXGroupAddress.LengthInBits()
+	var lengthInBits = m.KNXGroupAddress.LengthInBits()
 
 	// Simple field (subGroup)
 	lengthInBits += 16
@@ -98,7 +98,7 @@ func (m KNXGroupAddressFreeLevel) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (subGroup)
 		subGroup := uint16(m.SubGroup)
-		_subGroupErr := io.WriteUint16(16, (subGroup))
+		_subGroupErr := io.WriteUint16(16, subGroup)
 		if _subGroupErr != nil {
 			return errors.New("Error serializing 'subGroup' field " + _subGroupErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXNetIPMessage.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXNetIPMessage.go
index 94e0e5b..a8056f7 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXNetIPMessage.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KNXNetIPMessage.go
@@ -168,7 +168,7 @@ func KNXNetIPMessageSerialize(io spi.WriteBuffer, m KNXNetIPMessage, i IKNXNetIP
 
 	// Implicit Field (headerLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	headerLength := uint8(uint8(6))
-	_headerLengthErr := io.WriteUint8(8, (headerLength))
+	_headerLengthErr := io.WriteUint8(8, headerLength)
 	if _headerLengthErr != nil {
 		return errors.New("Error serializing 'headerLength' field " + _headerLengthErr.Error())
 	}
@@ -181,14 +181,14 @@ func KNXNetIPMessageSerialize(io spi.WriteBuffer, m KNXNetIPMessage, i IKNXNetIP
 
 	// Discriminator Field (msgType) (Used as input to a switch field)
 	msgType := uint16(i.MsgType())
-	_msgTypeErr := io.WriteUint16(16, (msgType))
+	_msgTypeErr := io.WriteUint16(16, msgType)
 	if _msgTypeErr != nil {
 		return errors.New("Error serializing 'msgType' field " + _msgTypeErr.Error())
 	}
 
 	// Implicit Field (totalLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	totalLength := uint16(uint16(m.LengthInBytes()))
-	_totalLengthErr := io.WriteUint16(16, (totalLength))
+	_totalLengthErr := io.WriteUint16(16, totalLength)
 	if _totalLengthErr != nil {
 		return errors.New("Error serializing 'totalLength' field " + _totalLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
index 95ce12a..6deec3d 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
@@ -69,7 +69,7 @@ func CastKnxNetIpCore(structType interface{}) KnxNetIpCore {
 }
 
 func (m KnxNetIpCore) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetIpCore) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
index d92bad9..b60de6e 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
@@ -69,7 +69,7 @@ func CastKnxNetIpDeviceManagement(structType interface{}) KnxNetIpDeviceManageme
 }
 
 func (m KnxNetIpDeviceManagement) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetIpDeviceManagement) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
index 6e9c80c..e7c4e0a 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
@@ -69,7 +69,7 @@ func CastKnxNetIpTunneling(structType interface{}) KnxNetIpTunneling {
 }
 
 func (m KnxNetIpTunneling) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetIpTunneling) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
index 9de0fcf..b08c666 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
@@ -69,7 +69,7 @@ func CastKnxNetObjectServer(structType interface{}) KnxNetObjectServer {
 }
 
 func (m KnxNetObjectServer) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetObjectServer) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
index ec027b5..f25f1e0 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
@@ -69,7 +69,7 @@ func CastKnxNetRemoteConfigurationAndDiagnosis(structType interface{}) KnxNetRem
 }
 
 func (m KnxNetRemoteConfigurationAndDiagnosis) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetRemoteConfigurationAndDiagnosis) Serialize(io spi.WriteBuffer) err
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
index c5f4d22..a21b5a5 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
@@ -69,7 +69,7 @@ func CastKnxNetRemoteLogging(structType interface{}) KnxNetRemoteLogging {
 }
 
 func (m KnxNetRemoteLogging) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ServiceId.LengthInBits()
+	var lengthInBits = m.ServiceId.LengthInBits()
 
 	// Simple field (version)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m KnxNetRemoteLogging) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (version)
 		version := uint8(m.Version)
-		_versionErr := io.WriteUint8(8, (version))
+		_versionErr := io.WriteUint8(8, version)
 		if _versionErr != nil {
 			return errors.New("Error serializing 'version' field " + _versionErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
index 4492599..883e6b3 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
@@ -97,14 +97,14 @@ func (m ProjectInstallationIdentifier) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (projectNumber)
 	projectNumber := uint8(m.ProjectNumber)
-	_projectNumberErr := io.WriteUint8(8, (projectNumber))
+	_projectNumberErr := io.WriteUint8(8, projectNumber)
 	if _projectNumberErr != nil {
 		return errors.New("Error serializing 'projectNumber' field " + _projectNumberErr.Error())
 	}
 
 	// Simple Field (installationNumber)
 	installationNumber := uint8(m.InstallationNumber)
-	_installationNumberErr := io.WriteUint8(8, (installationNumber))
+	_installationNumberErr := io.WriteUint8(8, installationNumber)
 	if _installationNumberErr != nil {
 		return errors.New("Error serializing 'installationNumber' field " + _installationNumberErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
index f41a5d4..0799243 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
@@ -87,7 +87,7 @@ func (m RelativeTimestamp) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (timestamp)
 	timestamp := uint16(m.Timestamp)
-	_timestampErr := io.WriteUint16(16, (timestamp))
+	_timestampErr := io.WriteUint16(16, timestamp)
 	if _timestampErr != nil {
 		return errors.New("Error serializing 'timestamp' field " + _timestampErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
index bd2c505..293cc7b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
@@ -67,7 +67,7 @@ func CastRoutingIndication(structType interface{}) RoutingIndication {
 }
 
 func (m RoutingIndication) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
index 2b28ee9..3d37549 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
@@ -70,7 +70,7 @@ func CastSearchRequest(structType interface{}) SearchRequest {
 }
 
 func (m SearchRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (hpaiIDiscoveryEndpoint)
 	lengthInBits += m.HpaiIDiscoveryEndpoint.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
index eac72eb..16ed87c 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
@@ -72,7 +72,7 @@ func CastSearchResponse(structType interface{}) SearchResponse {
 }
 
 func (m SearchResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (hpaiControlEndpoint)
 	lengthInBits += m.HpaiControlEndpoint.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
index 31b6bc3..d35470d 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
@@ -114,7 +114,7 @@ func ServiceIdSerialize(io spi.WriteBuffer, m ServiceId, i IServiceId, childSeri
 
 	// Discriminator Field (serviceType) (Used as input to a switch field)
 	serviceType := uint8(i.ServiceType())
-	_serviceTypeErr := io.WriteUint8(8, (serviceType))
+	_serviceTypeErr := io.WriteUint8(8, serviceType)
 	if _serviceTypeErr != nil {
 		return errors.New("Error serializing 'serviceType' field " + _serviceTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
index 72c97a0..fbe4836 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
@@ -71,7 +71,7 @@ func CastTunnelingRequest(structType interface{}) TunnelingRequest {
 }
 
 func (m TunnelingRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (tunnelingRequestDataBlock)
 	lengthInBits += m.TunnelingRequestDataBlock.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
index 0d0c693..e825c29 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
@@ -124,21 +124,21 @@ func (m TunnelingRequestDataBlock) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (communicationChannelId)
 	communicationChannelId := uint8(m.CommunicationChannelId)
-	_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+	_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 	if _communicationChannelIdErr != nil {
 		return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 	}
 
 	// Simple Field (sequenceCounter)
 	sequenceCounter := uint8(m.SequenceCounter)
-	_sequenceCounterErr := io.WriteUint8(8, (sequenceCounter))
+	_sequenceCounterErr := io.WriteUint8(8, sequenceCounter)
 	if _sequenceCounterErr != nil {
 		return errors.New("Error serializing 'sequenceCounter' field " + _sequenceCounterErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
index 4722e31..b4b6d9b 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
@@ -70,7 +70,7 @@ func CastTunnelingResponse(structType interface{}) TunnelingResponse {
 }
 
 func (m TunnelingResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Simple field (tunnelingResponseDataBlock)
 	lengthInBits += m.TunnelingResponseDataBlock.LengthInBits()
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
index 68998c7..518dbda 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
@@ -116,21 +116,21 @@ func (m TunnelingResponseDataBlock) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (structureLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	structureLength := uint8(uint8(m.LengthInBytes()))
-	_structureLengthErr := io.WriteUint8(8, (structureLength))
+	_structureLengthErr := io.WriteUint8(8, structureLength)
 	if _structureLengthErr != nil {
 		return errors.New("Error serializing 'structureLength' field " + _structureLengthErr.Error())
 	}
 
 	// Simple Field (communicationChannelId)
 	communicationChannelId := uint8(m.CommunicationChannelId)
-	_communicationChannelIdErr := io.WriteUint8(8, (communicationChannelId))
+	_communicationChannelIdErr := io.WriteUint8(8, communicationChannelId)
 	if _communicationChannelIdErr != nil {
 		return errors.New("Error serializing 'communicationChannelId' field " + _communicationChannelIdErr.Error())
 	}
 
 	// Simple Field (sequenceCounter)
 	sequenceCounter := uint8(m.SequenceCounter)
-	_sequenceCounterErr := io.WriteUint8(8, (sequenceCounter))
+	_sequenceCounterErr := io.WriteUint8(8, sequenceCounter)
 	if _sequenceCounterErr != nil {
 		return errors.New("Error serializing 'sequenceCounter' field " + _sequenceCounterErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
index dca4037..780cafc 100644
--- a/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
+++ b/sandbox/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
@@ -69,7 +69,7 @@ func CastUnknownMessage(structType interface{}) UnknownMessage {
 }
 
 func (m UnknownMessage) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.KNXNetIPMessage.LengthInBits()
+	var lengthInBits = m.KNXNetIPMessage.LengthInBits()
 
 	// Array field
 	if len(m.UnknownData) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/modbus/ModbusConnection.go b/sandbox/plc4go/internal/plc4go/modbus/ModbusConnection.go
new file mode 100644
index 0000000..d254d7b
--- /dev/null
+++ b/sandbox/plc4go/internal/plc4go/modbus/ModbusConnection.go
@@ -0,0 +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 modbus
+
+import (
+	internalModel "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/model"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
+)
+
+type ModbusConnectionMetadata struct {
+	model.PlcConnectionMetadata
+}
+
+func (m ModbusConnectionMetadata) CanRead() bool {
+	return true
+}
+
+func (m ModbusConnectionMetadata) CanWrite() bool {
+	return true
+}
+
+func (m ModbusConnectionMetadata) CanSubscribe() bool {
+	return false
+}
+
+type ModbusConnection struct {
+	fieldHandler spi.PlcFieldHandler
+	plc4go.PlcConnection
+}
+
+func NewModbusConnection(fieldHandler spi.PlcFieldHandler) ModbusConnection {
+	return ModbusConnection{
+		fieldHandler: fieldHandler,
+	}
+}
+
+func (m ModbusConnection) Connect() <-chan plc4go.PlcConnectionConnectResult {
+	panic("implement me")
+}
+
+func (m ModbusConnection) Close() <-chan plc4go.PlcConnectionCloseResult {
+	panic("implement me")
+}
+
+func (m ModbusConnection) IsConnected() bool {
+	panic("implement me")
+}
+
+func (m ModbusConnection) Ping() <-chan plc4go.PlcConnectionPingResult {
+	panic("implement me")
+}
+
+func (m ModbusConnection) GetMetadata() model.PlcConnectionMetadata {
+	return ModbusConnectionMetadata{}
+}
+
+func (m ModbusConnection) ReadRequestBuilder() model.PlcReadRequestBuilder {
+	// TODO: Pass a real reader in here ...
+	return internalModel.NewDefaultPlcReadRequestBuilder(m.fieldHandler, nil)
+}
+
+func (m ModbusConnection) WriteRequestBuilder() model.PlcWriteRequestBuilder {
+	panic("implement me")
+}
+
+func (m ModbusConnection) SubscriptionRequestBuilder() model.PlcSubscriptionRequestBuilder {
+	panic("implement me")
+}
+
+func (m ModbusConnection) UnsubscriptionRequestBuilder() model.PlcUnsubscriptionRequestBuilder {
+	panic("implement me")
+}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go b/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
index 66f5a24..5a0fb9b 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
@@ -18,8 +18,35 @@
 //
 package modbus
 
-import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+)
+
+type modbusDriver struct {
+	fieldHandler spi.PlcFieldHandler
+	plc4go.PlcDriver
+}
 
 func NewModbusDriver() plc4go.PlcDriver {
-	return nil
+	return modbusDriver{
+		fieldHandler: NewModbusFieldHandler(),
+	}
+}
+
+func (m modbusDriver) GetProtocolCode() string {
+	return "modbus"
+}
+
+func (m modbusDriver) GetProtocolName() string {
+	return "Modbus"
+}
+
+func (m modbusDriver) CheckQuery(query string) error {
+	_, err := m.fieldHandler.ParseQuery(query)
+	return err
+}
+
+func (m modbusDriver) GetConnection(connectionString string) (plc4go.PlcConnection, error) {
+	return NewModbusConnection(m.fieldHandler), nil
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go b/sandbox/plc4go/internal/plc4go/modbus/ModbusFieldHandler.go
similarity index 79%
copy from sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
copy to sandbox/plc4go/internal/plc4go/modbus/ModbusFieldHandler.go
index 66f5a24..1cf36af 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/ModbusFieldHandler.go
@@ -18,8 +18,12 @@
 //
 package modbus
 
-import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
 
-func NewModbusDriver() plc4go.PlcDriver {
-	return nil
+type ModbusFieldHandler struct {
+	spi.PlcFieldHandler
+}
+
+func NewModbusFieldHandler() ModbusFieldHandler {
+	return ModbusFieldHandler{}
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
index 3fdad11..54f931e 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
@@ -200,7 +200,7 @@ func ModbusPDUSerialize(io spi.WriteBuffer, m ModbusPDU, i IModbusPDU, childSeri
 
 	// Discriminator Field (functionFlag) (Used as input to a switch field)
 	functionFlag := uint8(i.FunctionFlag())
-	_functionFlagErr := io.WriteUint8(7, (functionFlag))
+	_functionFlagErr := io.WriteUint8(7, functionFlag)
 	if _functionFlagErr != nil {
 		return errors.New("Error serializing 'functionFlag' field " + _functionFlagErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
index 34df24f..5e8be9e 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUDiagnosticRequest(structType interface{}) ModbusPDUDiagnosticR
 }
 
 func (m ModbusPDUDiagnosticRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (status)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUDiagnosticRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (status)
 		status := uint16(m.Status)
-		_statusErr := io.WriteUint16(16, (status))
+		_statusErr := io.WriteUint16(16, status)
 		if _statusErr != nil {
 			return errors.New("Error serializing 'status' field " + _statusErr.Error())
 		}
 
 		// Simple Field (eventCount)
 		eventCount := uint16(m.EventCount)
-		_eventCountErr := io.WriteUint16(16, (eventCount))
+		_eventCountErr := io.WriteUint16(16, eventCount)
 		if _eventCountErr != nil {
 			return errors.New("Error serializing 'eventCount' field " + _eventCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
index a4cff59..fc7c286 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
@@ -77,7 +77,7 @@ func CastModbusPDUError(structType interface{}) ModbusPDUError {
 }
 
 func (m ModbusPDUError) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (exceptionCode)
 	lengthInBits += 8
@@ -106,7 +106,7 @@ func (m ModbusPDUError) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (exceptionCode)
 		exceptionCode := uint8(m.ExceptionCode)
-		_exceptionCodeErr := io.WriteUint8(8, (exceptionCode))
+		_exceptionCodeErr := io.WriteUint8(8, exceptionCode)
 		if _exceptionCodeErr != nil {
 			return errors.New("Error serializing 'exceptionCode' field " + _exceptionCodeErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
index 5aadb25..3c7532e 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
@@ -75,7 +75,7 @@ func CastModbusPDUGetComEventLogRequest(structType interface{}) ModbusPDUGetComE
 }
 
 func (m ModbusPDUGetComEventLogRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
index 249b59e..8c54e27 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
@@ -80,7 +80,7 @@ func CastModbusPDUGetComEventLogResponse(structType interface{}) ModbusPDUGetCom
 }
 
 func (m ModbusPDUGetComEventLogResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -153,28 +153,28 @@ func (m ModbusPDUGetComEventLogResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(uint8(len(m.Events))) + uint8(uint8(6)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
 
 		// Simple Field (status)
 		status := uint16(m.Status)
-		_statusErr := io.WriteUint16(16, (status))
+		_statusErr := io.WriteUint16(16, status)
 		if _statusErr != nil {
 			return errors.New("Error serializing 'status' field " + _statusErr.Error())
 		}
 
 		// Simple Field (eventCount)
 		eventCount := uint16(m.EventCount)
-		_eventCountErr := io.WriteUint16(16, (eventCount))
+		_eventCountErr := io.WriteUint16(16, eventCount)
 		if _eventCountErr != nil {
 			return errors.New("Error serializing 'eventCount' field " + _eventCountErr.Error())
 		}
 
 		// Simple Field (messageCount)
 		messageCount := uint16(m.MessageCount)
-		_messageCountErr := io.WriteUint16(16, (messageCount))
+		_messageCountErr := io.WriteUint16(16, messageCount)
 		if _messageCountErr != nil {
 			return errors.New("Error serializing 'messageCount' field " + _messageCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
index c7035b5..86caa8d 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
@@ -79,7 +79,7 @@ func CastModbusPDUMaskWriteHoldingRegisterRequest(structType interface{}) Modbus
 }
 
 func (m ModbusPDUMaskWriteHoldingRegisterRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (referenceAddress)
 	lengthInBits += 16
@@ -126,21 +126,21 @@ func (m ModbusPDUMaskWriteHoldingRegisterRequest) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (referenceAddress)
 		referenceAddress := uint16(m.ReferenceAddress)
-		_referenceAddressErr := io.WriteUint16(16, (referenceAddress))
+		_referenceAddressErr := io.WriteUint16(16, referenceAddress)
 		if _referenceAddressErr != nil {
 			return errors.New("Error serializing 'referenceAddress' field " + _referenceAddressErr.Error())
 		}
 
 		// Simple Field (andMask)
 		andMask := uint16(m.AndMask)
-		_andMaskErr := io.WriteUint16(16, (andMask))
+		_andMaskErr := io.WriteUint16(16, andMask)
 		if _andMaskErr != nil {
 			return errors.New("Error serializing 'andMask' field " + _andMaskErr.Error())
 		}
 
 		// Simple Field (orMask)
 		orMask := uint16(m.OrMask)
-		_orMaskErr := io.WriteUint16(16, (orMask))
+		_orMaskErr := io.WriteUint16(16, orMask)
 		if _orMaskErr != nil {
 			return errors.New("Error serializing 'orMask' field " + _orMaskErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
index 5dc7d69..a79d2bb 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
@@ -79,7 +79,7 @@ func CastModbusPDUMaskWriteHoldingRegisterResponse(structType interface{}) Modbu
 }
 
 func (m ModbusPDUMaskWriteHoldingRegisterResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (referenceAddress)
 	lengthInBits += 16
@@ -126,21 +126,21 @@ func (m ModbusPDUMaskWriteHoldingRegisterResponse) Serialize(io spi.WriteBuffer)
 
 		// Simple Field (referenceAddress)
 		referenceAddress := uint16(m.ReferenceAddress)
-		_referenceAddressErr := io.WriteUint16(16, (referenceAddress))
+		_referenceAddressErr := io.WriteUint16(16, referenceAddress)
 		if _referenceAddressErr != nil {
 			return errors.New("Error serializing 'referenceAddress' field " + _referenceAddressErr.Error())
 		}
 
 		// Simple Field (andMask)
 		andMask := uint16(m.AndMask)
-		_andMaskErr := io.WriteUint16(16, (andMask))
+		_andMaskErr := io.WriteUint16(16, andMask)
 		if _andMaskErr != nil {
 			return errors.New("Error serializing 'andMask' field " + _andMaskErr.Error())
 		}
 
 		// Simple Field (orMask)
 		orMask := uint16(m.OrMask)
-		_orMaskErr := io.WriteUint16(16, (orMask))
+		_orMaskErr := io.WriteUint16(16, orMask)
 		if _orMaskErr != nil {
 			return errors.New("Error serializing 'orMask' field " + _orMaskErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
index 7094fd7..f0bd8c9 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadCoilsRequest(structType interface{}) ModbusPDUReadCoilsReq
 }
 
 func (m ModbusPDUReadCoilsRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUReadCoilsRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
index 2d9bffc..812fe8f 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadCoilsResponse(structType interface{}) ModbusPDUReadCoilsRe
 }
 
 func (m ModbusPDUReadCoilsResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReadCoilsResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
index 33fa2ec..d1ea591 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
@@ -75,7 +75,7 @@ func CastModbusPDUReadDeviceIdentificationRequest(structType interface{}) Modbus
 }
 
 func (m ModbusPDUReadDeviceIdentificationRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
index 6256dd8..e8909df 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
@@ -75,7 +75,7 @@ func CastModbusPDUReadDeviceIdentificationResponse(structType interface{}) Modbu
 }
 
 func (m ModbusPDUReadDeviceIdentificationResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
index 396940b..4af1fcd 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadDiscreteInputsRequest(structType interface{}) ModbusPDURea
 }
 
 func (m ModbusPDUReadDiscreteInputsRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUReadDiscreteInputsRequest) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
index ec76954..6effcdb 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadDiscreteInputsResponse(structType interface{}) ModbusPDURe
 }
 
 func (m ModbusPDUReadDiscreteInputsResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReadDiscreteInputsResponse) Serialize(io spi.WriteBuffer) error
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
index d17a68e..ffb5f35 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
@@ -75,7 +75,7 @@ func CastModbusPDUReadExceptionStatusRequest(structType interface{}) ModbusPDURe
 }
 
 func (m ModbusPDUReadExceptionStatusRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
index cbf107d..ede3c61 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadExceptionStatusResponse(structType interface{}) ModbusPDUR
 }
 
 func (m ModbusPDUReadExceptionStatusResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (value)
 	lengthInBits += 8
@@ -106,7 +106,7 @@ func (m ModbusPDUReadExceptionStatusResponse) Serialize(io spi.WriteBuffer) erro
 
 		// Simple Field (value)
 		value := uint8(m.Value)
-		_valueErr := io.WriteUint8(8, (value))
+		_valueErr := io.WriteUint8(8, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
index a816f45..59a51fd 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadFifoQueueRequest(structType interface{}) ModbusPDUReadFifo
 }
 
 func (m ModbusPDUReadFifoQueueRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (fifoPointerAddress)
 	lengthInBits += 16
@@ -106,7 +106,7 @@ func (m ModbusPDUReadFifoQueueRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (fifoPointerAddress)
 		fifoPointerAddress := uint16(m.FifoPointerAddress)
-		_fifoPointerAddressErr := io.WriteUint16(16, (fifoPointerAddress))
+		_fifoPointerAddressErr := io.WriteUint16(16, fifoPointerAddress)
 		if _fifoPointerAddressErr != nil {
 			return errors.New("Error serializing 'fifoPointerAddress' field " + _fifoPointerAddressErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
index 88503fc..29e8d2d 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadFifoQueueResponse(structType interface{}) ModbusPDUReadFif
 }
 
 func (m ModbusPDUReadFifoQueueResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 16
@@ -132,14 +132,14 @@ func (m ModbusPDUReadFifoQueueResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint16(uint16(uint16(uint16(uint16(len(m.FifoValue)))*uint16(uint16(2)))) + uint16(uint16(2)))
-		_byteCountErr := io.WriteUint16(16, (byteCount))
+		_byteCountErr := io.WriteUint16(16, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
 
 		// Implicit Field (fifoCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		fifoCount := uint16(uint16(uint16(uint16(uint16(len(m.FifoValue)))*uint16(uint16(2)))) / uint16(uint16(2)))
-		_fifoCountErr := io.WriteUint16(16, (fifoCount))
+		_fifoCountErr := io.WriteUint16(16, fifoCount)
 		if _fifoCountErr != nil {
 			return errors.New("Error serializing 'fifoCount' field " + _fifoCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
index 0b7d115..a8b7111 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadFileRecordRequest(structType interface{}) ModbusPDUReadFil
 }
 
 func (m ModbusPDUReadFileRecordRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -139,7 +139,7 @@ func (m ModbusPDUReadFileRecordRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
index b1fdbc8..b0fb6b3 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
@@ -117,28 +117,28 @@ func (m ModbusPDUReadFileRecordRequestItem) Serialize(io spi.WriteBuffer) error
 
 	// Simple Field (referenceType)
 	referenceType := uint8(m.ReferenceType)
-	_referenceTypeErr := io.WriteUint8(8, (referenceType))
+	_referenceTypeErr := io.WriteUint8(8, referenceType)
 	if _referenceTypeErr != nil {
 		return errors.New("Error serializing 'referenceType' field " + _referenceTypeErr.Error())
 	}
 
 	// Simple Field (fileNumber)
 	fileNumber := uint16(m.FileNumber)
-	_fileNumberErr := io.WriteUint16(16, (fileNumber))
+	_fileNumberErr := io.WriteUint16(16, fileNumber)
 	if _fileNumberErr != nil {
 		return errors.New("Error serializing 'fileNumber' field " + _fileNumberErr.Error())
 	}
 
 	// Simple Field (recordNumber)
 	recordNumber := uint16(m.RecordNumber)
-	_recordNumberErr := io.WriteUint16(16, (recordNumber))
+	_recordNumberErr := io.WriteUint16(16, recordNumber)
 	if _recordNumberErr != nil {
 		return errors.New("Error serializing 'recordNumber' field " + _recordNumberErr.Error())
 	}
 
 	// Simple Field (recordLength)
 	recordLength := uint16(m.RecordLength)
-	_recordLengthErr := io.WriteUint16(16, (recordLength))
+	_recordLengthErr := io.WriteUint16(16, recordLength)
 	if _recordLengthErr != nil {
 		return errors.New("Error serializing 'recordLength' field " + _recordLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
index 8e046bd..821c595 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadFileRecordResponse(structType interface{}) ModbusPDUReadFi
 }
 
 func (m ModbusPDUReadFileRecordResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -139,7 +139,7 @@ func (m ModbusPDUReadFileRecordResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
index 05fc1df..c55a695 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
@@ -115,14 +115,14 @@ func (m ModbusPDUReadFileRecordResponseItem) Serialize(io spi.WriteBuffer) error
 
 	// Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	dataLength := uint8(uint8(uint8(len(m.Data))) + uint8(uint8(1)))
-	_dataLengthErr := io.WriteUint8(8, (dataLength))
+	_dataLengthErr := io.WriteUint8(8, dataLength)
 	if _dataLengthErr != nil {
 		return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 	}
 
 	// Simple Field (referenceType)
 	referenceType := uint8(m.ReferenceType)
-	_referenceTypeErr := io.WriteUint8(8, (referenceType))
+	_referenceTypeErr := io.WriteUint8(8, referenceType)
 	if _referenceTypeErr != nil {
 		return errors.New("Error serializing 'referenceType' field " + _referenceTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
index 7e21759..0da6d45 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadHoldingRegistersRequest(structType interface{}) ModbusPDUR
 }
 
 func (m ModbusPDUReadHoldingRegistersRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUReadHoldingRegistersRequest) Serialize(io spi.WriteBuffer) erro
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
index 6252558..7ecfc54 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadHoldingRegistersResponse(structType interface{}) ModbusPDU
 }
 
 func (m ModbusPDUReadHoldingRegistersResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReadHoldingRegistersResponse) Serialize(io spi.WriteBuffer) err
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
index 8df9a6e..21c6a0b 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUReadInputRegistersRequest(structType interface{}) ModbusPDURea
 }
 
 func (m ModbusPDUReadInputRegistersRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUReadInputRegistersRequest) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
index a6c876b..bafc003 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadInputRegistersResponse(structType interface{}) ModbusPDURe
 }
 
 func (m ModbusPDUReadInputRegistersResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReadInputRegistersResponse) Serialize(io spi.WriteBuffer) error
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
index e825fd9..1078909 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
@@ -81,7 +81,7 @@ func CastModbusPDUReadWriteMultipleHoldingRegistersRequest(structType interface{
 }
 
 func (m ModbusPDUReadWriteMultipleHoldingRegistersRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (readStartingAddress)
 	lengthInBits += 16
@@ -163,35 +163,35 @@ func (m ModbusPDUReadWriteMultipleHoldingRegistersRequest) Serialize(io spi.Writ
 
 		// Simple Field (readStartingAddress)
 		readStartingAddress := uint16(m.ReadStartingAddress)
-		_readStartingAddressErr := io.WriteUint16(16, (readStartingAddress))
+		_readStartingAddressErr := io.WriteUint16(16, readStartingAddress)
 		if _readStartingAddressErr != nil {
 			return errors.New("Error serializing 'readStartingAddress' field " + _readStartingAddressErr.Error())
 		}
 
 		// Simple Field (readQuantity)
 		readQuantity := uint16(m.ReadQuantity)
-		_readQuantityErr := io.WriteUint16(16, (readQuantity))
+		_readQuantityErr := io.WriteUint16(16, readQuantity)
 		if _readQuantityErr != nil {
 			return errors.New("Error serializing 'readQuantity' field " + _readQuantityErr.Error())
 		}
 
 		// Simple Field (writeStartingAddress)
 		writeStartingAddress := uint16(m.WriteStartingAddress)
-		_writeStartingAddressErr := io.WriteUint16(16, (writeStartingAddress))
+		_writeStartingAddressErr := io.WriteUint16(16, writeStartingAddress)
 		if _writeStartingAddressErr != nil {
 			return errors.New("Error serializing 'writeStartingAddress' field " + _writeStartingAddressErr.Error())
 		}
 
 		// Simple Field (writeQuantity)
 		writeQuantity := uint16(m.WriteQuantity)
-		_writeQuantityErr := io.WriteUint16(16, (writeQuantity))
+		_writeQuantityErr := io.WriteUint16(16, writeQuantity)
 		if _writeQuantityErr != nil {
 			return errors.New("Error serializing 'writeQuantity' field " + _writeQuantityErr.Error())
 		}
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
index 8b36139..f8f2e1a 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReadWriteMultipleHoldingRegistersResponse(structType interface
 }
 
 func (m ModbusPDUReadWriteMultipleHoldingRegistersResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReadWriteMultipleHoldingRegistersResponse) Serialize(io spi.Wri
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
index d63c7ca..7cb7556 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
@@ -75,7 +75,7 @@ func CastModbusPDUReportServerIdRequest(structType interface{}) ModbusPDUReportS
 }
 
 func (m ModbusPDUReportServerIdRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
index 54d3f8a..11ffe30 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
@@ -77,7 +77,7 @@ func CastModbusPDUReportServerIdResponse(structType interface{}) ModbusPDUReport
 }
 
 func (m ModbusPDUReportServerIdResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -123,7 +123,7 @@ func (m ModbusPDUReportServerIdResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
index 1dfed04..1be7838 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteFileRecordRequest(structType interface{}) ModbusPDUWriteF
 }
 
 func (m ModbusPDUWriteFileRecordRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -139,7 +139,7 @@ func (m ModbusPDUWriteFileRecordRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
index 4547ac3..7bfea93 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
@@ -135,28 +135,28 @@ func (m ModbusPDUWriteFileRecordRequestItem) Serialize(io spi.WriteBuffer) error
 
 	// Simple Field (referenceType)
 	referenceType := uint8(m.ReferenceType)
-	_referenceTypeErr := io.WriteUint8(8, (referenceType))
+	_referenceTypeErr := io.WriteUint8(8, referenceType)
 	if _referenceTypeErr != nil {
 		return errors.New("Error serializing 'referenceType' field " + _referenceTypeErr.Error())
 	}
 
 	// Simple Field (fileNumber)
 	fileNumber := uint16(m.FileNumber)
-	_fileNumberErr := io.WriteUint16(16, (fileNumber))
+	_fileNumberErr := io.WriteUint16(16, fileNumber)
 	if _fileNumberErr != nil {
 		return errors.New("Error serializing 'fileNumber' field " + _fileNumberErr.Error())
 	}
 
 	// Simple Field (recordNumber)
 	recordNumber := uint16(m.RecordNumber)
-	_recordNumberErr := io.WriteUint16(16, (recordNumber))
+	_recordNumberErr := io.WriteUint16(16, recordNumber)
 	if _recordNumberErr != nil {
 		return errors.New("Error serializing 'recordNumber' field " + _recordNumberErr.Error())
 	}
 
 	// Implicit Field (recordLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	recordLength := uint16(uint16(uint16(len(m.RecordData))) / uint16(uint16(2)))
-	_recordLengthErr := io.WriteUint16(16, (recordLength))
+	_recordLengthErr := io.WriteUint16(16, recordLength)
 	if _recordLengthErr != nil {
 		return errors.New("Error serializing 'recordLength' field " + _recordLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
index a5b0934..f6d24a5 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteFileRecordResponse(structType interface{}) ModbusPDUWrite
 }
 
 func (m ModbusPDUWriteFileRecordResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Implicit Field (byteCount)
 	lengthInBits += 8
@@ -139,7 +139,7 @@ func (m ModbusPDUWriteFileRecordResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(itemsArraySizeInBytes(m.Items)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
index deab30e..e89b961 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
@@ -135,28 +135,28 @@ func (m ModbusPDUWriteFileRecordResponseItem) Serialize(io spi.WriteBuffer) erro
 
 	// Simple Field (referenceType)
 	referenceType := uint8(m.ReferenceType)
-	_referenceTypeErr := io.WriteUint8(8, (referenceType))
+	_referenceTypeErr := io.WriteUint8(8, referenceType)
 	if _referenceTypeErr != nil {
 		return errors.New("Error serializing 'referenceType' field " + _referenceTypeErr.Error())
 	}
 
 	// Simple Field (fileNumber)
 	fileNumber := uint16(m.FileNumber)
-	_fileNumberErr := io.WriteUint16(16, (fileNumber))
+	_fileNumberErr := io.WriteUint16(16, fileNumber)
 	if _fileNumberErr != nil {
 		return errors.New("Error serializing 'fileNumber' field " + _fileNumberErr.Error())
 	}
 
 	// Simple Field (recordNumber)
 	recordNumber := uint16(m.RecordNumber)
-	_recordNumberErr := io.WriteUint16(16, (recordNumber))
+	_recordNumberErr := io.WriteUint16(16, recordNumber)
 	if _recordNumberErr != nil {
 		return errors.New("Error serializing 'recordNumber' field " + _recordNumberErr.Error())
 	}
 
 	// Implicit Field (recordLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	recordLength := uint16(uint16(uint16(len(m.RecordData))) / uint16(uint16(2)))
-	_recordLengthErr := io.WriteUint16(16, (recordLength))
+	_recordLengthErr := io.WriteUint16(16, recordLength)
 	if _recordLengthErr != nil {
 		return errors.New("Error serializing 'recordLength' field " + _recordLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
index 9c623e3..0517b82 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
@@ -79,7 +79,7 @@ func CastModbusPDUWriteMultipleCoilsRequest(structType interface{}) ModbusPDUWri
 }
 
 func (m ModbusPDUWriteMultipleCoilsRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -143,21 +143,21 @@ func (m ModbusPDUWriteMultipleCoilsRequest) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
index 2acfae9..ae48637 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteMultipleCoilsResponse(structType interface{}) ModbusPDUWr
 }
 
 func (m ModbusPDUWriteMultipleCoilsResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteMultipleCoilsResponse) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
index 112462e..dcaf488 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
@@ -79,7 +79,7 @@ func CastModbusPDUWriteMultipleHoldingRegistersRequest(structType interface{}) M
 }
 
 func (m ModbusPDUWriteMultipleHoldingRegistersRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -143,21 +143,21 @@ func (m ModbusPDUWriteMultipleHoldingRegistersRequest) Serialize(io spi.WriteBuf
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
 
 		// Implicit Field (byteCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		byteCount := uint8(uint8(len(m.Value)))
-		_byteCountErr := io.WriteUint8(8, (byteCount))
+		_byteCountErr := io.WriteUint8(8, byteCount)
 		if _byteCountErr != nil {
 			return errors.New("Error serializing 'byteCount' field " + _byteCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
index 673e24d..7d741ac 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteMultipleHoldingRegistersResponse(structType interface{})
 }
 
 func (m ModbusPDUWriteMultipleHoldingRegistersResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (startingAddress)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteMultipleHoldingRegistersResponse) Serialize(io spi.WriteBu
 
 		// Simple Field (startingAddress)
 		startingAddress := uint16(m.StartingAddress)
-		_startingAddressErr := io.WriteUint16(16, (startingAddress))
+		_startingAddressErr := io.WriteUint16(16, startingAddress)
 		if _startingAddressErr != nil {
 			return errors.New("Error serializing 'startingAddress' field " + _startingAddressErr.Error())
 		}
 
 		// Simple Field (quantity)
 		quantity := uint16(m.Quantity)
-		_quantityErr := io.WriteUint16(16, (quantity))
+		_quantityErr := io.WriteUint16(16, quantity)
 		if _quantityErr != nil {
 			return errors.New("Error serializing 'quantity' field " + _quantityErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
index 8f48415..eac5512 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteSingleCoilRequest(structType interface{}) ModbusPDUWriteS
 }
 
 func (m ModbusPDUWriteSingleCoilRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (address)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteSingleCoilRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (address)
 		address := uint16(m.Address)
-		_addressErr := io.WriteUint16(16, (address))
+		_addressErr := io.WriteUint16(16, address)
 		if _addressErr != nil {
 			return errors.New("Error serializing 'address' field " + _addressErr.Error())
 		}
 
 		// Simple Field (value)
 		value := uint16(m.Value)
-		_valueErr := io.WriteUint16(16, (value))
+		_valueErr := io.WriteUint16(16, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
index e7a06d1..28d12ab 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteSingleCoilResponse(structType interface{}) ModbusPDUWrite
 }
 
 func (m ModbusPDUWriteSingleCoilResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (address)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteSingleCoilResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (address)
 		address := uint16(m.Address)
-		_addressErr := io.WriteUint16(16, (address))
+		_addressErr := io.WriteUint16(16, address)
 		if _addressErr != nil {
 			return errors.New("Error serializing 'address' field " + _addressErr.Error())
 		}
 
 		// Simple Field (value)
 		value := uint16(m.Value)
-		_valueErr := io.WriteUint16(16, (value))
+		_valueErr := io.WriteUint16(16, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
index c4cfb59..dc33109 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteSingleRegisterRequest(structType interface{}) ModbusPDUWr
 }
 
 func (m ModbusPDUWriteSingleRegisterRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (address)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteSingleRegisterRequest) Serialize(io spi.WriteBuffer) error
 
 		// Simple Field (address)
 		address := uint16(m.Address)
-		_addressErr := io.WriteUint16(16, (address))
+		_addressErr := io.WriteUint16(16, address)
 		if _addressErr != nil {
 			return errors.New("Error serializing 'address' field " + _addressErr.Error())
 		}
 
 		// Simple Field (value)
 		value := uint16(m.Value)
-		_valueErr := io.WriteUint16(16, (value))
+		_valueErr := io.WriteUint16(16, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
index 3571d67..9d4818b 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
@@ -78,7 +78,7 @@ func CastModbusPDUWriteSingleRegisterResponse(structType interface{}) ModbusPDUW
 }
 
 func (m ModbusPDUWriteSingleRegisterResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.ModbusPDU.LengthInBits()
+	var lengthInBits = m.ModbusPDU.LengthInBits()
 
 	// Simple field (address)
 	lengthInBits += 16
@@ -116,14 +116,14 @@ func (m ModbusPDUWriteSingleRegisterResponse) Serialize(io spi.WriteBuffer) erro
 
 		// Simple Field (address)
 		address := uint16(m.Address)
-		_addressErr := io.WriteUint16(16, (address))
+		_addressErr := io.WriteUint16(16, address)
 		if _addressErr != nil {
 			return errors.New("Error serializing 'address' field " + _addressErr.Error())
 		}
 
 		// Simple Field (value)
 		value := uint16(m.Value)
-		_valueErr := io.WriteUint16(16, (value))
+		_valueErr := io.WriteUint16(16, value)
 		if _valueErr != nil {
 			return errors.New("Error serializing 'value' field " + _valueErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
index 1854a6c..83859fb 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
@@ -141,7 +141,7 @@ func (m ModbusSerialADU) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (transactionId)
 	transactionId := uint16(m.TransactionId)
-	_transactionIdErr := io.WriteUint16(16, (transactionId))
+	_transactionIdErr := io.WriteUint16(16, transactionId)
 	if _transactionIdErr != nil {
 		return errors.New("Error serializing 'transactionId' field " + _transactionIdErr.Error())
 	}
@@ -156,14 +156,14 @@ func (m ModbusSerialADU) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (length)
 	length := uint16(m.Length)
-	_lengthErr := io.WriteUint16(16, (length))
+	_lengthErr := io.WriteUint16(16, length)
 	if _lengthErr != nil {
 		return errors.New("Error serializing 'length' field " + _lengthErr.Error())
 	}
 
 	// Simple Field (address)
 	address := uint8(m.Address)
-	_addressErr := io.WriteUint8(8, (address))
+	_addressErr := io.WriteUint8(8, address)
 	if _addressErr != nil {
 		return errors.New("Error serializing 'address' field " + _addressErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
index 938e0c5..8e1c351 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
+++ b/sandbox/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
@@ -138,7 +138,7 @@ func (m ModbusTcpADU) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (transactionIdentifier)
 	transactionIdentifier := uint16(m.TransactionIdentifier)
-	_transactionIdentifierErr := io.WriteUint16(16, (transactionIdentifier))
+	_transactionIdentifierErr := io.WriteUint16(16, transactionIdentifier)
 	if _transactionIdentifierErr != nil {
 		return errors.New("Error serializing 'transactionIdentifier' field " + _transactionIdentifierErr.Error())
 	}
@@ -151,14 +151,14 @@ func (m ModbusTcpADU) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (length) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	length := uint16(uint16(m.Pdu.LengthInBytes()) + uint16(uint16(1)))
-	_lengthErr := io.WriteUint16(16, (length))
+	_lengthErr := io.WriteUint16(16, length)
 	if _lengthErr != nil {
 		return errors.New("Error serializing 'length' field " + _lengthErr.Error())
 	}
 
 	// Simple Field (unitIdentifier)
 	unitIdentifier := uint8(m.UnitIdentifier)
-	_unitIdentifierErr := io.WriteUint8(8, (unitIdentifier))
+	_unitIdentifierErr := io.WriteUint8(8, unitIdentifier)
 	if _unitIdentifierErr != nil {
 		return errors.New("Error serializing 'unitIdentifier' field " + _unitIdentifierErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/model/plc_read_request.go b/sandbox/plc4go/internal/plc4go/model/DefaultPlcReadRequest.go
similarity index 57%
rename from sandbox/plc4go/internal/plc4go/model/plc_read_request.go
rename to sandbox/plc4go/internal/plc4go/model/DefaultPlcReadRequest.go
index 1aecbab..c68a14b 100644
--- a/sandbox/plc4go/internal/plc4go/model/plc_read_request.go
+++ b/sandbox/plc4go/internal/plc4go/model/DefaultPlcReadRequest.go
@@ -19,51 +19,52 @@
 package model
 
 import (
-	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go"
+	"errors"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
 	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
-	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
 )
 
 type DefaultPlcReadRequestBuilder struct {
-	names        []string
-	queries      []string
-	fieldHandler plc4go.PlcFieldHandler
 	reader       PlcReader
+	fieldHandler spi.PlcFieldHandler
+	queries      map[string]string
+	model.PlcReadRequestBuilder
 }
 
-func NewDefaultPlcReadRequestBuilder(fieldHandler plc4go.PlcFieldHandler, reader PlcReader) *DefaultPlcReadRequestBuilder {
+func NewDefaultPlcReadRequestBuilder(fieldHandler spi.PlcFieldHandler, reader PlcReader) *DefaultPlcReadRequestBuilder {
 	return &DefaultPlcReadRequestBuilder{
-		names:        []string{},
-		queries:      []string{},
-		fieldHandler: fieldHandler,
 		reader:       reader,
+		fieldHandler: fieldHandler,
+		queries:      map[string]string{},
 	}
 }
 
-func (m *DefaultPlcReadRequestBuilder) AddItem(name string, query string) *DefaultPlcReadRequestBuilder {
-	m.names = append(m.names, name)
-	m.queries = append(m.queries, query)
-	return m
+func (m *DefaultPlcReadRequestBuilder) AddItem(name string, query string) {
+	m.queries[name] = query
 }
 
-func (m *DefaultPlcReadRequestBuilder) Build() model.PlcReadRequest {
-	fields := make(map[string]values.PlcValue)
-	for i, name := range m.names {
-		query := m.queries[i]
-		field := m.fieldHandler.ParseQuery(query)
+func (m *DefaultPlcReadRequestBuilder) Build() (model.PlcReadRequest, error) {
+	fields := make(map[string]model.PlcField)
+	for _, name := range m.queries {
+		query := m.queries[name]
+		field, err := m.fieldHandler.ParseQuery(query)
+		if err != nil {
+			return nil, errors.New("Error parsing query: " + query + ". Got error: " + err.Error())
+		}
 		fields[name] = field
 	}
-	return defaultPlcReadRequest{
+	return DefaultPlcReadRequest{
 		fields: fields,
 		reader: m.reader,
-	}
+	}, nil
 }
 
-type defaultPlcReadRequest struct {
-	fields map[string]values.PlcValue
+type DefaultPlcReadRequest struct {
+	fields map[string]model.PlcField
 	reader PlcReader
+	model.PlcReadRequest
 }
 
-func (m defaultPlcReadRequest) Execute() (<-chan model.PlcReadResponse, error) {
+func (m DefaultPlcReadRequest) Execute() <-chan model.PlcReadRequestResult {
 	return m.reader.Read()
 }
diff --git a/sandbox/plc4go/internal/plc4go/model/DefaultPlcWriteRequest.go b/sandbox/plc4go/internal/plc4go/model/DefaultPlcWriteRequest.go
new file mode 100644
index 0000000..2ecf9df
--- /dev/null
+++ b/sandbox/plc4go/internal/plc4go/model/DefaultPlcWriteRequest.go
@@ -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 model
+
+import (
+	"errors"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
+)
+
+type DefaultPlcWriteRequestBuilder struct {
+	writer       PlcWriter
+	fieldHandler spi.PlcFieldHandler
+	valueHandler spi.PlcValueHandler
+	queries      map[string]string
+	values       map[string]interface{}
+}
+
+func NewDefaultPlcWriteRequestBuilder(fieldHandler spi.PlcFieldHandler, valueHandler spi.PlcValueHandler, writer PlcWriter) *DefaultPlcWriteRequestBuilder {
+	return &DefaultPlcWriteRequestBuilder{
+		writer:       writer,
+		fieldHandler: fieldHandler,
+		valueHandler: valueHandler,
+		queries:      map[string]string{},
+		values:       map[string]interface{}{},
+	}
+}
+
+func (m *DefaultPlcWriteRequestBuilder) AddItem(name string, query string, value interface{}) {
+	m.queries[name] = query
+	m.values[name] = value
+}
+
+func (m *DefaultPlcWriteRequestBuilder) Build() (model.PlcWriteRequest, error) {
+	fields := make(map[string]model.PlcField)
+	values := make(map[string]values.PlcValue)
+	for _, name := range m.queries {
+		query := m.queries[name]
+		field, err := m.fieldHandler.ParseQuery(query)
+		if err != nil {
+			return nil, errors.New("Error parsing query: " + query + ". Got error: " + err.Error())
+		}
+		fields[name] = field
+		value, err := m.valueHandler.NewPlcValue(field.GetTypeName(), m.values[name])
+		if err != nil {
+			return nil, errors.New("Error parsing value of type: " + field.GetTypeName() + ". Got error: " + err.Error())
+		}
+		values[name] = value
+	}
+	return DefaultPlcWriteRequest{
+		fields: fields,
+		values: values,
+		writer: m.writer,
+	}, nil
+}
+
+type DefaultPlcWriteRequest struct {
+	fields map[string]model.PlcField
+	values map[string]values.PlcValue
+	writer PlcWriter
+	model.PlcWriteRequest
+}
+
+func (m DefaultPlcWriteRequest) Execute() <-chan model.PlcWriteRequestResult {
+	return m.writer.Write()
+}
diff --git a/sandbox/plc4go/internal/plc4go/model/plc_reader.go b/sandbox/plc4go/internal/plc4go/model/PlcReader.go
similarity index 95%
copy from sandbox/plc4go/internal/plc4go/model/plc_reader.go
copy to sandbox/plc4go/internal/plc4go/model/PlcReader.go
index 15e85af..398e02b 100644
--- a/sandbox/plc4go/internal/plc4go/model/plc_reader.go
+++ b/sandbox/plc4go/internal/plc4go/model/PlcReader.go
@@ -21,5 +21,5 @@ package model
 import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
 
 type PlcReader interface {
-	Read() (<-chan model.PlcReadResponse, error)
+	Read() <-chan model.PlcReadRequestResult
 }
diff --git a/sandbox/plc4go/internal/plc4go/model/plc_writer.go b/sandbox/plc4go/internal/plc4go/model/PlcWriter.go
similarity index 95%
rename from sandbox/plc4go/internal/plc4go/model/plc_writer.go
rename to sandbox/plc4go/internal/plc4go/model/PlcWriter.go
index 2b469c1..b0cdfc5 100644
--- a/sandbox/plc4go/internal/plc4go/model/plc_writer.go
+++ b/sandbox/plc4go/internal/plc4go/model/PlcWriter.go
@@ -21,5 +21,5 @@ package model
 import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
 
 type PlcWriter interface {
-	Write() (<-chan model.PlcWriteResponse, error)
+	Write() <-chan model.PlcWriteRequestResult
 }
diff --git a/sandbox/plc4go/internal/plc4go/model/plc_write_request.go b/sandbox/plc4go/internal/plc4go/model/plc_write_request.go
deleted file mode 100644
index 8f67652..0000000
--- a/sandbox/plc4go/internal/plc4go/model/plc_write_request.go
+++ /dev/null
@@ -1,76 +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 model
-
-import (
-	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go"
-	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
-	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
-)
-
-type DefaultPlcWriteRequestBuilder struct {
-	names        []string
-	queries      []string
-	plcValues    []values.PlcValue
-	fieldHandler plc4go.PlcFieldHandler
-	writer       PlcWriter
-}
-
-func NewDefaultPlcWriteRequestBuilder(fieldHandler plc4go.PlcFieldHandler, writer PlcWriter) *DefaultPlcWriteRequestBuilder {
-	return &DefaultPlcWriteRequestBuilder{
-		names:        []string{},
-		queries:      []string{},
-		plcValues:    []values.PlcValue{},
-		fieldHandler: fieldHandler,
-		writer:       writer,
-	}
-}
-
-func (m *DefaultPlcWriteRequestBuilder) AddItem(name string, query string, plcValues values.PlcValue) *DefaultPlcWriteRequestBuilder {
-	m.names = append(m.names, name)
-	m.queries = append(m.queries, query)
-	m.plcValues = append(m.plcValues, plcValues)
-	return m
-}
-
-func (m *DefaultPlcWriteRequestBuilder) Build() model.PlcWriteRequest {
-	fields := make(map[string]model.PlcField)
-	plcValues := make(map[string]values.PlcValue)
-	for i, name := range m.names {
-		query := m.queries[i]
-		field := m.fieldHandler.ParseQuery(query)
-		fields[name] = field
-		plcValues[name] = m.plcValues[i]
-	}
-	return defaultPlcWriteRequest{
-		fields:    fields,
-		plcValues: plcValues,
-		writer:    m.writer,
-	}
-}
-
-type defaultPlcWriteRequest struct {
-	fields    map[string]model.PlcField
-	plcValues map[string]values.PlcValue
-	writer    PlcWriter
-}
-
-func (m defaultPlcWriteRequest) Execute() (<-chan model.PlcWriteResponse, error) {
-	return m.writer.Write()
-}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
index fc4169b..e97c746 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
@@ -176,14 +176,14 @@ func COTPPacketSerialize(io spi.WriteBuffer, m COTPPacket, i ICOTPPacket, childS
 
 	// Implicit Field (headerLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	headerLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(uint8(uint8(spi.InlineIf(bool(bool((m.Payload) != (nil))), uint16((*m.Payload).LengthInBytes()), uint16(uint8(0)))))+uint8(uint8(1)))))
-	_headerLengthErr := io.WriteUint8(8, (headerLength))
+	_headerLengthErr := io.WriteUint8(8, headerLength)
 	if _headerLengthErr != nil {
 		return errors.New("Error serializing 'headerLength' field " + _headerLengthErr.Error())
 	}
 
 	// Discriminator Field (tpduCode) (Used as input to a switch field)
 	tpduCode := uint8(i.TpduCode())
-	_tpduCodeErr := io.WriteUint8(8, (tpduCode))
+	_tpduCodeErr := io.WriteUint8(8, tpduCode)
 	if _tpduCodeErr != nil {
 		return errors.New("Error serializing 'tpduCode' field " + _tpduCodeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
index 4d6722e..495b2e5 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
@@ -73,7 +73,7 @@ func CastCOTPPacketConnectionRequest(structType interface{}) COTPPacketConnectio
 }
 
 func (m COTPPacketConnectionRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (destinationReference)
 	lengthInBits += 16
@@ -120,14 +120,14 @@ func (m COTPPacketConnectionRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (destinationReference)
 		destinationReference := uint16(m.DestinationReference)
-		_destinationReferenceErr := io.WriteUint16(16, (destinationReference))
+		_destinationReferenceErr := io.WriteUint16(16, destinationReference)
 		if _destinationReferenceErr != nil {
 			return errors.New("Error serializing 'destinationReference' field " + _destinationReferenceErr.Error())
 		}
 
 		// Simple Field (sourceReference)
 		sourceReference := uint16(m.SourceReference)
-		_sourceReferenceErr := io.WriteUint16(16, (sourceReference))
+		_sourceReferenceErr := io.WriteUint16(16, sourceReference)
 		if _sourceReferenceErr != nil {
 			return errors.New("Error serializing 'sourceReference' field " + _sourceReferenceErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
index 2ba264b..04cb3e3 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
@@ -73,7 +73,7 @@ func CastCOTPPacketConnectionResponse(structType interface{}) COTPPacketConnecti
 }
 
 func (m COTPPacketConnectionResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (destinationReference)
 	lengthInBits += 16
@@ -120,14 +120,14 @@ func (m COTPPacketConnectionResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (destinationReference)
 		destinationReference := uint16(m.DestinationReference)
-		_destinationReferenceErr := io.WriteUint16(16, (destinationReference))
+		_destinationReferenceErr := io.WriteUint16(16, destinationReference)
 		if _destinationReferenceErr != nil {
 			return errors.New("Error serializing 'destinationReference' field " + _destinationReferenceErr.Error())
 		}
 
 		// Simple Field (sourceReference)
 		sourceReference := uint16(m.SourceReference)
-		_sourceReferenceErr := io.WriteUint16(16, (sourceReference))
+		_sourceReferenceErr := io.WriteUint16(16, sourceReference)
 		if _sourceReferenceErr != nil {
 			return errors.New("Error serializing 'sourceReference' field " + _sourceReferenceErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
index b83a622..0bc1dd2 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
@@ -72,7 +72,7 @@ func CastCOTPPacketData(structType interface{}) COTPPacketData {
 }
 
 func (m COTPPacketData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (eot)
 	lengthInBits += 1
@@ -117,7 +117,7 @@ func (m COTPPacketData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (tpduRef)
 		tpduRef := uint8(m.TpduRef)
-		_tpduRefErr := io.WriteUint8(7, (tpduRef))
+		_tpduRefErr := io.WriteUint8(7, tpduRef)
 		if _tpduRefErr != nil {
 			return errors.New("Error serializing 'tpduRef' field " + _tpduRefErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
index 78c207e..c197721 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
@@ -73,7 +73,7 @@ func CastCOTPPacketDisconnectRequest(structType interface{}) COTPPacketDisconnec
 }
 
 func (m COTPPacketDisconnectRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (destinationReference)
 	lengthInBits += 16
@@ -120,14 +120,14 @@ func (m COTPPacketDisconnectRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (destinationReference)
 		destinationReference := uint16(m.DestinationReference)
-		_destinationReferenceErr := io.WriteUint16(16, (destinationReference))
+		_destinationReferenceErr := io.WriteUint16(16, destinationReference)
 		if _destinationReferenceErr != nil {
 			return errors.New("Error serializing 'destinationReference' field " + _destinationReferenceErr.Error())
 		}
 
 		// Simple Field (sourceReference)
 		sourceReference := uint16(m.SourceReference)
-		_sourceReferenceErr := io.WriteUint16(16, (sourceReference))
+		_sourceReferenceErr := io.WriteUint16(16, sourceReference)
 		if _sourceReferenceErr != nil {
 			return errors.New("Error serializing 'sourceReference' field " + _sourceReferenceErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
index f839311..24a8393 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
@@ -72,7 +72,7 @@ func CastCOTPPacketDisconnectResponse(structType interface{}) COTPPacketDisconne
 }
 
 func (m COTPPacketDisconnectResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (destinationReference)
 	lengthInBits += 16
@@ -110,14 +110,14 @@ func (m COTPPacketDisconnectResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (destinationReference)
 		destinationReference := uint16(m.DestinationReference)
-		_destinationReferenceErr := io.WriteUint16(16, (destinationReference))
+		_destinationReferenceErr := io.WriteUint16(16, destinationReference)
 		if _destinationReferenceErr != nil {
 			return errors.New("Error serializing 'destinationReference' field " + _destinationReferenceErr.Error())
 		}
 
 		// Simple Field (sourceReference)
 		sourceReference := uint16(m.SourceReference)
-		_sourceReferenceErr := io.WriteUint16(16, (sourceReference))
+		_sourceReferenceErr := io.WriteUint16(16, sourceReference)
 		if _sourceReferenceErr != nil {
 			return errors.New("Error serializing 'sourceReference' field " + _sourceReferenceErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
index bef60fb..f1f9902 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
@@ -72,7 +72,7 @@ func CastCOTPPacketTpduError(structType interface{}) COTPPacketTpduError {
 }
 
 func (m COTPPacketTpduError) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPPacket.LengthInBits()
+	var lengthInBits = m.COTPPacket.LengthInBits()
 
 	// Simple field (destinationReference)
 	lengthInBits += 16
@@ -110,14 +110,14 @@ func (m COTPPacketTpduError) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (destinationReference)
 		destinationReference := uint16(m.DestinationReference)
-		_destinationReferenceErr := io.WriteUint16(16, (destinationReference))
+		_destinationReferenceErr := io.WriteUint16(16, destinationReference)
 		if _destinationReferenceErr != nil {
 			return errors.New("Error serializing 'destinationReference' field " + _destinationReferenceErr.Error())
 		}
 
 		// Simple Field (rejectCause)
 		rejectCause := uint8(m.RejectCause)
-		_rejectCauseErr := io.WriteUint8(8, (rejectCause))
+		_rejectCauseErr := io.WriteUint8(8, rejectCause)
 		if _rejectCauseErr != nil {
 			return errors.New("Error serializing 'rejectCause' field " + _rejectCauseErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
index a77d371..4b0daf2 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
@@ -121,14 +121,14 @@ func COTPParameterSerialize(io spi.WriteBuffer, m COTPParameter, i ICOTPParamete
 
 	// Discriminator Field (parameterType) (Used as input to a switch field)
 	parameterType := uint8(i.ParameterType())
-	_parameterTypeErr := io.WriteUint8(8, (parameterType))
+	_parameterTypeErr := io.WriteUint8(8, parameterType)
 	if _parameterTypeErr != nil {
 		return errors.New("Error serializing 'parameterType' field " + _parameterTypeErr.Error())
 	}
 
 	// Implicit Field (parameterLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	parameterLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(2)))
-	_parameterLengthErr := io.WriteUint8(8, (parameterLength))
+	_parameterLengthErr := io.WriteUint8(8, parameterLength)
 	if _parameterLengthErr != nil {
 		return errors.New("Error serializing 'parameterLength' field " + _parameterLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
index f4e299a..c3cc5a0 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
@@ -69,7 +69,7 @@ func CastCOTPParameterCalledTsap(structType interface{}) COTPParameterCalledTsap
 }
 
 func (m COTPParameterCalledTsap) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPParameter.LengthInBits()
+	var lengthInBits = m.COTPParameter.LengthInBits()
 
 	// Simple field (tsapId)
 	lengthInBits += 16
@@ -98,7 +98,7 @@ func (m COTPParameterCalledTsap) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (tsapId)
 		tsapId := uint16(m.TsapId)
-		_tsapIdErr := io.WriteUint16(16, (tsapId))
+		_tsapIdErr := io.WriteUint16(16, tsapId)
 		if _tsapIdErr != nil {
 			return errors.New("Error serializing 'tsapId' field " + _tsapIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
index ad2a6d6..98b2028 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
@@ -69,7 +69,7 @@ func CastCOTPParameterCallingTsap(structType interface{}) COTPParameterCallingTs
 }
 
 func (m COTPParameterCallingTsap) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPParameter.LengthInBits()
+	var lengthInBits = m.COTPParameter.LengthInBits()
 
 	// Simple field (tsapId)
 	lengthInBits += 16
@@ -98,7 +98,7 @@ func (m COTPParameterCallingTsap) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (tsapId)
 		tsapId := uint16(m.TsapId)
-		_tsapIdErr := io.WriteUint16(16, (tsapId))
+		_tsapIdErr := io.WriteUint16(16, tsapId)
 		if _tsapIdErr != nil {
 			return errors.New("Error serializing 'tsapId' field " + _tsapIdErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
index 37fdec7..14ff7d1 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
@@ -69,7 +69,7 @@ func CastCOTPParameterChecksum(structType interface{}) COTPParameterChecksum {
 }
 
 func (m COTPParameterChecksum) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPParameter.LengthInBits()
+	var lengthInBits = m.COTPParameter.LengthInBits()
 
 	// Simple field (crc)
 	lengthInBits += 8
@@ -98,7 +98,7 @@ func (m COTPParameterChecksum) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (crc)
 		crc := uint8(m.Crc)
-		_crcErr := io.WriteUint8(8, (crc))
+		_crcErr := io.WriteUint8(8, crc)
 		if _crcErr != nil {
 			return errors.New("Error serializing 'crc' field " + _crcErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index 39dc4f7..2d42b8f 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -69,7 +69,7 @@ func CastCOTPParameterDisconnectAdditionalInformation(structType interface{}) CO
 }
 
 func (m COTPParameterDisconnectAdditionalInformation) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPParameter.LengthInBits()
+	var lengthInBits = m.COTPParameter.LengthInBits()
 
 	// Array field
 	if len(m.Data) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
index 3d3c817..7a48b12 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
@@ -69,7 +69,7 @@ func CastCOTPParameterTpduSize(structType interface{}) COTPParameterTpduSize {
 }
 
 func (m COTPParameterTpduSize) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.COTPParameter.LengthInBits()
+	var lengthInBits = m.COTPParameter.LengthInBits()
 
 	// Enum Field (tpduSize)
 	lengthInBits += 8
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go
index 63030e6..b31f5db 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Address.go
@@ -104,7 +104,7 @@ func S7AddressSerialize(io spi.WriteBuffer, m S7Address, i IS7Address, childSeri
 
 	// Discriminator Field (addressType) (Used as input to a switch field)
 	addressType := uint8(i.AddressType())
-	_addressTypeErr := io.WriteUint8(8, (addressType))
+	_addressTypeErr := io.WriteUint8(8, addressType)
 	if _addressTypeErr != nil {
 		return errors.New("Error serializing 'addressType' field " + _addressTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
index 0ad9e5e..e404f70 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
@@ -75,7 +75,7 @@ func CastS7AddressAny(structType interface{}) S7AddressAny {
 }
 
 func (m S7AddressAny) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Address.LengthInBits()
+	var lengthInBits = m.S7Address.LengthInBits()
 
 	// Enum Field (transportSize)
 	lengthInBits += 8
@@ -173,14 +173,14 @@ func (m S7AddressAny) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (numberOfElements)
 		numberOfElements := uint16(m.NumberOfElements)
-		_numberOfElementsErr := io.WriteUint16(16, (numberOfElements))
+		_numberOfElementsErr := io.WriteUint16(16, numberOfElements)
 		if _numberOfElementsErr != nil {
 			return errors.New("Error serializing 'numberOfElements' field " + _numberOfElementsErr.Error())
 		}
 
 		// Simple Field (dbNumber)
 		dbNumber := uint16(m.DbNumber)
-		_dbNumberErr := io.WriteUint16(16, (dbNumber))
+		_dbNumberErr := io.WriteUint16(16, dbNumber)
 		if _dbNumberErr != nil {
 			return errors.New("Error serializing 'dbNumber' field " + _dbNumberErr.Error())
 		}
@@ -202,14 +202,14 @@ func (m S7AddressAny) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (byteAddress)
 		byteAddress := uint16(m.ByteAddress)
-		_byteAddressErr := io.WriteUint16(16, (byteAddress))
+		_byteAddressErr := io.WriteUint16(16, byteAddress)
 		if _byteAddressErr != nil {
 			return errors.New("Error serializing 'byteAddress' field " + _byteAddressErr.Error())
 		}
 
 		// Simple Field (bitAddress)
 		bitAddress := uint8(m.BitAddress)
-		_bitAddressErr := io.WriteUint8(3, (bitAddress))
+		_bitAddressErr := io.WriteUint8(3, bitAddress)
 		if _bitAddressErr != nil {
 			return errors.New("Error serializing 'bitAddress' field " + _bitAddressErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go
index 39b803d..7e2ac10 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Message.go
@@ -195,7 +195,7 @@ func S7MessageParse(io *spi.ReadBuffer) (spi.Message, error) {
 	// Optional Field (payload) (Can be skipped, if a given expression evaluates to false)
 	var payload *IS7Payload = nil
 	if bool((payloadLength) > (0)) {
-		_message, _err := S7PayloadParse(io, messageType, (*parameter))
+		_message, _err := S7PayloadParse(io, messageType, *parameter)
 		if _err != nil {
 			return nil, errors.New("Error parsing 'payload' field " + _err.Error())
 		}
@@ -221,7 +221,7 @@ func S7MessageSerialize(io spi.WriteBuffer, m S7Message, i IS7Message, childSeri
 
 	// Discriminator Field (messageType) (Used as input to a switch field)
 	messageType := uint8(i.MessageType())
-	_messageTypeErr := io.WriteUint8(8, (messageType))
+	_messageTypeErr := io.WriteUint8(8, messageType)
 	if _messageTypeErr != nil {
 		return errors.New("Error serializing 'messageType' field " + _messageTypeErr.Error())
 	}
@@ -236,21 +236,21 @@ func S7MessageSerialize(io spi.WriteBuffer, m S7Message, i IS7Message, childSeri
 
 	// Simple Field (tpduReference)
 	tpduReference := uint16(m.TpduReference)
-	_tpduReferenceErr := io.WriteUint16(16, (tpduReference))
+	_tpduReferenceErr := io.WriteUint16(16, tpduReference)
 	if _tpduReferenceErr != nil {
 		return errors.New("Error serializing 'tpduReference' field " + _tpduReferenceErr.Error())
 	}
 
 	// Implicit Field (parameterLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	parameterLength := uint16(spi.InlineIf(bool((m.Parameter) != (nil)), uint16((*m.Parameter).LengthInBytes()), uint16(uint16(0))))
-	_parameterLengthErr := io.WriteUint16(16, (parameterLength))
+	_parameterLengthErr := io.WriteUint16(16, parameterLength)
 	if _parameterLengthErr != nil {
 		return errors.New("Error serializing 'parameterLength' field " + _parameterLengthErr.Error())
 	}
 
 	// Implicit Field (payloadLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	payloadLength := uint16(spi.InlineIf(bool((m.Payload) != (nil)), uint16((*m.Payload).LengthInBytes()), uint16(uint16(0))))
-	_payloadLengthErr := io.WriteUint16(16, (payloadLength))
+	_payloadLengthErr := io.WriteUint16(16, payloadLength)
 	if _payloadLengthErr != nil {
 		return errors.New("Error serializing 'payloadLength' field " + _payloadLengthErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
index 5c7c023..40147b9 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
@@ -70,7 +70,7 @@ func CastS7MessageRequest(structType interface{}) S7MessageRequest {
 }
 
 func (m S7MessageRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Message.LengthInBits()
+	var lengthInBits = m.S7Message.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
index 0f86939..e555fbe 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
@@ -73,7 +73,7 @@ func CastS7MessageResponse(structType interface{}) S7MessageResponse {
 }
 
 func (m S7MessageResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Message.LengthInBits()
+	var lengthInBits = m.S7Message.LengthInBits()
 
 	// Simple field (errorClass)
 	lengthInBits += 8
@@ -111,14 +111,14 @@ func (m S7MessageResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (errorClass)
 		errorClass := uint8(m.ErrorClass)
-		_errorClassErr := io.WriteUint8(8, (errorClass))
+		_errorClassErr := io.WriteUint8(8, errorClass)
 		if _errorClassErr != nil {
 			return errors.New("Error serializing 'errorClass' field " + _errorClassErr.Error())
 		}
 
 		// Simple Field (errorCode)
 		errorCode := uint8(m.ErrorCode)
-		_errorCodeErr := io.WriteUint8(8, (errorCode))
+		_errorCodeErr := io.WriteUint8(8, errorCode)
 		if _errorCodeErr != nil {
 			return errors.New("Error serializing 'errorCode' field " + _errorCodeErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
index 3db93a4..019bbc5 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
@@ -73,7 +73,7 @@ func CastS7MessageResponseData(structType interface{}) S7MessageResponseData {
 }
 
 func (m S7MessageResponseData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Message.LengthInBits()
+	var lengthInBits = m.S7Message.LengthInBits()
 
 	// Simple field (errorClass)
 	lengthInBits += 8
@@ -111,14 +111,14 @@ func (m S7MessageResponseData) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (errorClass)
 		errorClass := uint8(m.ErrorClass)
-		_errorClassErr := io.WriteUint8(8, (errorClass))
+		_errorClassErr := io.WriteUint8(8, errorClass)
 		if _errorClassErr != nil {
 			return errors.New("Error serializing 'errorClass' field " + _errorClassErr.Error())
 		}
 
 		// Simple Field (errorCode)
 		errorCode := uint8(m.ErrorCode)
-		_errorCodeErr := io.WriteUint8(8, (errorCode))
+		_errorCodeErr := io.WriteUint8(8, errorCode)
 		if _errorCodeErr != nil {
 			return errors.New("Error serializing 'errorCode' field " + _errorCodeErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
index ddb0e66..3eadc1e 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
@@ -70,7 +70,7 @@ func CastS7MessageUserData(structType interface{}) S7MessageUserData {
 }
 
 func (m S7MessageUserData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Message.LengthInBits()
+	var lengthInBits = m.S7Message.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
index b2531d1..7d7b58b 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
@@ -119,7 +119,7 @@ func S7ParameterSerialize(io spi.WriteBuffer, m S7Parameter, i IS7Parameter, chi
 
 	// Discriminator Field (parameterType) (Used as input to a switch field)
 	parameterType := uint8(i.ParameterType())
-	_parameterTypeErr := io.WriteUint8(8, (parameterType))
+	_parameterTypeErr := io.WriteUint8(8, parameterType)
 	if _parameterTypeErr != nil {
 		return errors.New("Error serializing 'parameterType' field " + _parameterTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
index e88da7c..f2fc9f3 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
@@ -74,7 +74,7 @@ func CastS7ParameterReadVarRequest(structType interface{}) S7ParameterReadVarReq
 }
 
 func (m S7ParameterReadVarRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Implicit Field (numItems)
 	lengthInBits += 8
@@ -127,7 +127,7 @@ func (m S7ParameterReadVarRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		numItems := uint8(uint8(len(m.Items)))
-		_numItemsErr := io.WriteUint8(8, (numItems))
+		_numItemsErr := io.WriteUint8(8, numItems)
 		if _numItemsErr != nil {
 			return errors.New("Error serializing 'numItems' field " + _numItemsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
index 49290c6..29d3b8e 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
@@ -73,7 +73,7 @@ func CastS7ParameterReadVarResponse(structType interface{}) S7ParameterReadVarRe
 }
 
 func (m S7ParameterReadVarResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Simple field (numItems)
 	lengthInBits += 8
@@ -102,7 +102,7 @@ func (m S7ParameterReadVarResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (numItems)
 		numItems := uint8(m.NumItems)
-		_numItemsErr := io.WriteUint8(8, (numItems))
+		_numItemsErr := io.WriteUint8(8, numItems)
 		if _numItemsErr != nil {
 			return errors.New("Error serializing 'numItems' field " + _numItemsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
index 8e4752a..60d92a9 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
@@ -76,7 +76,7 @@ func CastS7ParameterSetupCommunication(structType interface{}) S7ParameterSetupC
 }
 
 func (m S7ParameterSetupCommunication) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Reserved Field (reserved)
 	lengthInBits += 8
@@ -148,21 +148,21 @@ func (m S7ParameterSetupCommunication) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (maxAmqCaller)
 		maxAmqCaller := uint16(m.MaxAmqCaller)
-		_maxAmqCallerErr := io.WriteUint16(16, (maxAmqCaller))
+		_maxAmqCallerErr := io.WriteUint16(16, maxAmqCaller)
 		if _maxAmqCallerErr != nil {
 			return errors.New("Error serializing 'maxAmqCaller' field " + _maxAmqCallerErr.Error())
 		}
 
 		// Simple Field (maxAmqCallee)
 		maxAmqCallee := uint16(m.MaxAmqCallee)
-		_maxAmqCalleeErr := io.WriteUint16(16, (maxAmqCallee))
+		_maxAmqCalleeErr := io.WriteUint16(16, maxAmqCallee)
 		if _maxAmqCalleeErr != nil {
 			return errors.New("Error serializing 'maxAmqCallee' field " + _maxAmqCalleeErr.Error())
 		}
 
 		// Simple Field (pduLength)
 		pduLength := uint16(m.PduLength)
-		_pduLengthErr := io.WriteUint16(16, (pduLength))
+		_pduLengthErr := io.WriteUint16(16, pduLength)
 		if _pduLengthErr != nil {
 			return errors.New("Error serializing 'pduLength' field " + _pduLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
index a4274ee..439ffc9 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
@@ -74,7 +74,7 @@ func CastS7ParameterUserData(structType interface{}) S7ParameterUserData {
 }
 
 func (m S7ParameterUserData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Implicit Field (numItems)
 	lengthInBits += 8
@@ -127,7 +127,7 @@ func (m S7ParameterUserData) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		numItems := uint8(uint8(len(m.Items)))
-		_numItemsErr := io.WriteUint8(8, (numItems))
+		_numItemsErr := io.WriteUint8(8, numItems)
 		if _numItemsErr != nil {
 			return errors.New("Error serializing 'numItems' field " + _numItemsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go
index 7e0b202..09bdeeb 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItem.go
@@ -104,7 +104,7 @@ func S7ParameterUserDataItemSerialize(io spi.WriteBuffer, m S7ParameterUserDataI
 
 	// Discriminator Field (itemType) (Used as input to a switch field)
 	itemType := uint8(i.ItemType())
-	_itemTypeErr := io.WriteUint8(8, (itemType))
+	_itemTypeErr := io.WriteUint8(8, itemType)
 	if _itemTypeErr != nil {
 		return errors.New("Error serializing 'itemType' field " + _itemTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
index 3e8e8a2..41d14bb 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
@@ -76,7 +76,7 @@ func CastS7ParameterUserDataItemCPUFunctions(structType interface{}) S7Parameter
 }
 
 func (m S7ParameterUserDataItemCPUFunctions) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7ParameterUserDataItem.LengthInBits()
+	var lengthInBits = m.S7ParameterUserDataItem.LengthInBits()
 
 	// Implicit Field (itemLength)
 	lengthInBits += 8
@@ -198,42 +198,42 @@ func (m S7ParameterUserDataItemCPUFunctions) Serialize(io spi.WriteBuffer) error
 
 		// Implicit Field (itemLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		itemLength := uint8(uint8(uint8(m.LengthInBytes())) - uint8(uint8(2)))
-		_itemLengthErr := io.WriteUint8(8, (itemLength))
+		_itemLengthErr := io.WriteUint8(8, itemLength)
 		if _itemLengthErr != nil {
 			return errors.New("Error serializing 'itemLength' field " + _itemLengthErr.Error())
 		}
 
 		// Simple Field (method)
 		method := uint8(m.Method)
-		_methodErr := io.WriteUint8(8, (method))
+		_methodErr := io.WriteUint8(8, method)
 		if _methodErr != nil {
 			return errors.New("Error serializing 'method' field " + _methodErr.Error())
 		}
 
 		// Simple Field (cpuFunctionType)
 		cpuFunctionType := uint8(m.CpuFunctionType)
-		_cpuFunctionTypeErr := io.WriteUint8(4, (cpuFunctionType))
+		_cpuFunctionTypeErr := io.WriteUint8(4, cpuFunctionType)
 		if _cpuFunctionTypeErr != nil {
 			return errors.New("Error serializing 'cpuFunctionType' field " + _cpuFunctionTypeErr.Error())
 		}
 
 		// Simple Field (cpuFunctionGroup)
 		cpuFunctionGroup := uint8(m.CpuFunctionGroup)
-		_cpuFunctionGroupErr := io.WriteUint8(4, (cpuFunctionGroup))
+		_cpuFunctionGroupErr := io.WriteUint8(4, cpuFunctionGroup)
 		if _cpuFunctionGroupErr != nil {
 			return errors.New("Error serializing 'cpuFunctionGroup' field " + _cpuFunctionGroupErr.Error())
 		}
 
 		// Simple Field (cpuSubfunction)
 		cpuSubfunction := uint8(m.CpuSubfunction)
-		_cpuSubfunctionErr := io.WriteUint8(8, (cpuSubfunction))
+		_cpuSubfunctionErr := io.WriteUint8(8, cpuSubfunction)
 		if _cpuSubfunctionErr != nil {
 			return errors.New("Error serializing 'cpuSubfunction' field " + _cpuSubfunctionErr.Error())
 		}
 
 		// Simple Field (sequenceNumber)
 		sequenceNumber := uint8(m.SequenceNumber)
-		_sequenceNumberErr := io.WriteUint8(8, (sequenceNumber))
+		_sequenceNumberErr := io.WriteUint8(8, sequenceNumber)
 		if _sequenceNumberErr != nil {
 			return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
index 91aaaf7..d001c86 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
@@ -74,7 +74,7 @@ func CastS7ParameterWriteVarRequest(structType interface{}) S7ParameterWriteVarR
 }
 
 func (m S7ParameterWriteVarRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Implicit Field (numItems)
 	lengthInBits += 8
@@ -127,7 +127,7 @@ func (m S7ParameterWriteVarRequest) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (numItems) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		numItems := uint8(uint8(len(m.Items)))
-		_numItemsErr := io.WriteUint8(8, (numItems))
+		_numItemsErr := io.WriteUint8(8, numItems)
 		if _numItemsErr != nil {
 			return errors.New("Error serializing 'numItems' field " + _numItemsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
index d43b0ef..984c397 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
@@ -73,7 +73,7 @@ func CastS7ParameterWriteVarResponse(structType interface{}) S7ParameterWriteVar
 }
 
 func (m S7ParameterWriteVarResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Parameter.LengthInBits()
+	var lengthInBits = m.S7Parameter.LengthInBits()
 
 	// Simple field (numItems)
 	lengthInBits += 8
@@ -102,7 +102,7 @@ func (m S7ParameterWriteVarResponse) Serialize(io spi.WriteBuffer) error {
 
 		// Simple Field (numItems)
 		numItems := uint8(m.NumItems)
-		_numItemsErr := io.WriteUint8(8, (numItems))
+		_numItemsErr := io.WriteUint8(8, numItems)
 		if _numItemsErr != nil {
 			return errors.New("Error serializing 'numItems' field " + _numItemsErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
index 289329b..6199790 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -74,7 +74,7 @@ func CastS7PayloadReadVarResponse(structType interface{}) S7PayloadReadVarRespon
 }
 
 func (m S7PayloadReadVarResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Payload.LengthInBits()
+	var lengthInBits = m.S7Payload.LengthInBits()
 
 	// Array field
 	if len(m.Items) > 0 {
@@ -121,7 +121,7 @@ func (m S7PayloadReadVarResponse) Serialize(io spi.WriteBuffer) error {
 			itemCount := uint16(len(m.Items))
 			var curItem uint16 = 0
 			for _, _element := range m.Items {
-				var lastItem bool = curItem == (itemCount - 1)
+				var lastItem = curItem == (itemCount - 1)
 				_elementErr := _element.Serialize(io, lastItem)
 				if _elementErr != nil {
 					return errors.New("Error serializing 'items' field " + _elementErr.Error())
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
index 80f473c..51bba1a 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
@@ -74,7 +74,7 @@ func CastS7PayloadUserData(structType interface{}) S7PayloadUserData {
 }
 
 func (m S7PayloadUserData) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Payload.LengthInBits()
+	var lengthInBits = m.S7Payload.LengthInBits()
 
 	// Array field
 	if len(m.Items) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
index bee0dc2..740db06 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
@@ -166,7 +166,7 @@ func S7PayloadUserDataItemSerialize(io spi.WriteBuffer, m S7PayloadUserDataItem,
 
 	// Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	dataLength := uint16(uint16(uint16(m.LengthInBytes())) - uint16(uint16(4)))
-	_dataLengthErr := io.WriteUint16(16, (dataLength))
+	_dataLengthErr := io.WriteUint16(16, dataLength)
 	if _dataLengthErr != nil {
 		return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 	}
@@ -180,7 +180,7 @@ func S7PayloadUserDataItemSerialize(io spi.WriteBuffer, m S7PayloadUserDataItem,
 
 	// Simple Field (szlIndex)
 	szlIndex := uint16(m.SzlIndex)
-	_szlIndexErr := io.WriteUint16(16, (szlIndex))
+	_szlIndexErr := io.WriteUint16(16, szlIndex)
 	if _szlIndexErr != nil {
 		return errors.New("Error serializing 'szlIndex' field " + _szlIndexErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
index 771969e..4a8b7ae 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
@@ -71,7 +71,7 @@ func CastS7PayloadUserDataItemCpuFunctionReadSzlRequest(structType interface{})
 }
 
 func (m S7PayloadUserDataItemCpuFunctionReadSzlRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7PayloadUserDataItem.LengthInBits()
+	var lengthInBits = m.S7PayloadUserDataItem.LengthInBits()
 
 	return lengthInBits
 }
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
index fecf782..b7f77db 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
@@ -78,7 +78,7 @@ func CastS7PayloadUserDataItemCpuFunctionReadSzlResponse(structType interface{})
 }
 
 func (m S7PayloadUserDataItemCpuFunctionReadSzlResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7PayloadUserDataItem.LengthInBits()
+	var lengthInBits = m.S7PayloadUserDataItem.LengthInBits()
 
 	// Const Field (szlItemLength)
 	lengthInBits += 16
@@ -149,7 +149,7 @@ func (m S7PayloadUserDataItemCpuFunctionReadSzlResponse) Serialize(io spi.WriteB
 
 		// Implicit Field (szlItemCount) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		szlItemCount := uint16(uint16(len(m.Items)))
-		_szlItemCountErr := io.WriteUint16(16, (szlItemCount))
+		_szlItemCountErr := io.WriteUint16(16, szlItemCount)
 		if _szlItemCountErr != nil {
 			return errors.New("Error serializing 'szlItemCount' field " + _szlItemCountErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
index 3ee1ae2..d87ed7b 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -74,7 +74,7 @@ func CastS7PayloadWriteVarRequest(structType interface{}) S7PayloadWriteVarReque
 }
 
 func (m S7PayloadWriteVarRequest) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Payload.LengthInBits()
+	var lengthInBits = m.S7Payload.LengthInBits()
 
 	// Array field
 	if len(m.Items) > 0 {
@@ -121,7 +121,7 @@ func (m S7PayloadWriteVarRequest) Serialize(io spi.WriteBuffer) error {
 			itemCount := uint16(len(m.Items))
 			var curItem uint16 = 0
 			for _, _element := range m.Items {
-				var lastItem bool = curItem == (itemCount - 1)
+				var lastItem = curItem == (itemCount - 1)
 				_elementErr := _element.Serialize(io, lastItem)
 				if _elementErr != nil {
 					return errors.New("Error serializing 'items' field " + _elementErr.Error())
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
index b3966dc..4f551e7 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
@@ -74,7 +74,7 @@ func CastS7PayloadWriteVarResponse(structType interface{}) S7PayloadWriteVarResp
 }
 
 func (m S7PayloadWriteVarResponse) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7Payload.LengthInBits()
+	var lengthInBits = m.S7Payload.LengthInBits()
 
 	// Array field
 	if len(m.Items) > 0 {
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
index 859691e..b4091f3 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarPayloadDataItem.go
@@ -125,7 +125,7 @@ func S7VarPayloadDataItemParse(io *spi.ReadBuffer, lastItem bool) (spi.Message,
 
 	// Padding Field (padding)
 	{
-		_timesPadding := (spi.InlineIf(lastItem, uint16(uint8(0)), uint16(uint8(uint8(len(data)))%uint8(uint8(2)))))
+		_timesPadding := spi.InlineIf(lastItem, uint16(uint8(0)), uint16(uint8(uint8(len(data)))%uint8(uint8(2))))
 		for ; (io.HasMore(8)) && (_timesPadding > 0); _timesPadding-- {
 			// Just read the padding data and ignore it
 			_, _err := io.ReadUint8(8)
@@ -157,7 +157,7 @@ func (m S7VarPayloadDataItem) Serialize(io spi.WriteBuffer, lastItem bool) error
 
 	// Implicit Field (dataLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	dataLength := uint16(uint16(uint16(len(m.Data))) * uint16(uint16(spi.InlineIf(bool(bool((m.TransportSize) == (DataTransportSize_BIT))), uint16(uint16(1)), uint16(uint16(spi.InlineIf(transportSize.SizeInBits(), uint16(uint16(8)), uint16(uint16(1)))))))))
-	_dataLengthErr := io.WriteUint16(16, (dataLength))
+	_dataLengthErr := io.WriteUint16(16, dataLength)
 	if _dataLengthErr != nil {
 		return errors.New("Error serializing 'dataLength' field " + _dataLengthErr.Error())
 	}
@@ -177,7 +177,7 @@ func (m S7VarPayloadDataItem) Serialize(io spi.WriteBuffer, lastItem bool) error
 		_timesPadding := uint8(spi.InlineIf(lastItem, uint16(uint8(0)), uint16(uint8(uint8(len(m.Data)))%uint8(uint8(2)))))
 		for ; _timesPadding > 0; _timesPadding-- {
 			_paddingValue := uint8(uint8(0))
-			_paddingErr := io.WriteUint8(8, (_paddingValue))
+			_paddingErr := io.WriteUint8(8, _paddingValue)
 			if _paddingErr != nil {
 				return errors.New("Error serializing 'padding' field " + _paddingErr.Error())
 			}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go
index de3eb8a..620827c 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItem.go
@@ -104,7 +104,7 @@ func S7VarRequestParameterItemSerialize(io spi.WriteBuffer, m S7VarRequestParame
 
 	// Discriminator Field (itemType) (Used as input to a switch field)
 	itemType := uint8(i.ItemType())
-	_itemTypeErr := io.WriteUint8(8, (itemType))
+	_itemTypeErr := io.WriteUint8(8, itemType)
 	if _itemTypeErr != nil {
 		return errors.New("Error serializing 'itemType' field " + _itemTypeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
index 71facc1..d98c723 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
@@ -70,7 +70,7 @@ func CastS7VarRequestParameterItemAddress(structType interface{}) S7VarRequestPa
 }
 
 func (m S7VarRequestParameterItemAddress) LengthInBits() uint16 {
-	var lengthInBits uint16 = m.S7VarRequestParameterItem.LengthInBits()
+	var lengthInBits = m.S7VarRequestParameterItem.LengthInBits()
 
 	// Implicit Field (itemLength)
 	lengthInBits += 8
@@ -113,7 +113,7 @@ func (m S7VarRequestParameterItemAddress) Serialize(io spi.WriteBuffer) error {
 
 		// Implicit Field (itemLength) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 		itemLength := uint8(m.Address.LengthInBytes())
-		_itemLengthErr := io.WriteUint8(8, (itemLength))
+		_itemLengthErr := io.WriteUint8(8, itemLength)
 		if _itemLengthErr != nil {
 			return errors.New("Error serializing 'itemLength' field " + _itemLengthErr.Error())
 		}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go
index 784c53b..333e1b9 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlDataTreeItem.go
@@ -135,7 +135,7 @@ func (m SzlDataTreeItem) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (itemIndex)
 	itemIndex := uint16(m.ItemIndex)
-	_itemIndexErr := io.WriteUint16(16, (itemIndex))
+	_itemIndexErr := io.WriteUint16(16, itemIndex)
 	if _itemIndexErr != nil {
 		return errors.New("Error serializing 'itemIndex' field " + _itemIndexErr.Error())
 	}
@@ -152,21 +152,21 @@ func (m SzlDataTreeItem) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (moduleTypeId)
 	moduleTypeId := uint16(m.ModuleTypeId)
-	_moduleTypeIdErr := io.WriteUint16(16, (moduleTypeId))
+	_moduleTypeIdErr := io.WriteUint16(16, moduleTypeId)
 	if _moduleTypeIdErr != nil {
 		return errors.New("Error serializing 'moduleTypeId' field " + _moduleTypeIdErr.Error())
 	}
 
 	// Simple Field (ausbg)
 	ausbg := uint16(m.Ausbg)
-	_ausbgErr := io.WriteUint16(16, (ausbg))
+	_ausbgErr := io.WriteUint16(16, ausbg)
 	if _ausbgErr != nil {
 		return errors.New("Error serializing 'ausbg' field " + _ausbgErr.Error())
 	}
 
 	// Simple Field (ausbe)
 	ausbe := uint16(m.Ausbe)
-	_ausbeErr := io.WriteUint16(16, (ausbe))
+	_ausbeErr := io.WriteUint16(16, ausbe)
 	if _ausbeErr != nil {
 		return errors.New("Error serializing 'ausbe' field " + _ausbeErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go
index 2101208..6a76cd3 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/SzlId.go
@@ -114,7 +114,7 @@ func (m SzlId) Serialize(io spi.WriteBuffer) error {
 
 	// Simple Field (sublistExtract)
 	sublistExtract := uint8(m.SublistExtract)
-	_sublistExtractErr := io.WriteUint8(4, (sublistExtract))
+	_sublistExtractErr := io.WriteUint8(4, sublistExtract)
 	if _sublistExtractErr != nil {
 		return errors.New("Error serializing 'sublistExtract' field " + _sublistExtractErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go
index e37fe26..c504585 100644
--- a/sandbox/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go
+++ b/sandbox/plc4go/internal/plc4go/s7/readwrite/model/TPKTPacket.go
@@ -150,7 +150,7 @@ func (m TPKTPacket) Serialize(io spi.WriteBuffer) error {
 
 	// Implicit Field (len) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
 	len := uint16(uint16(m.Payload.LengthInBytes()) + uint16(uint16(4)))
-	_lenErr := io.WriteUint16(16, (len))
+	_lenErr := io.WriteUint16(16, len)
 	if _lenErr != nil {
 		return errors.New("Error serializing 'len' field " + _lenErr.Error())
 	}
diff --git a/sandbox/plc4go/internal/plc4go/plc_field_handler.go b/sandbox/plc4go/internal/plc4go/spi/PlcFieldHandler.go
similarity index 94%
rename from sandbox/plc4go/internal/plc4go/plc_field_handler.go
rename to sandbox/plc4go/internal/plc4go/spi/PlcFieldHandler.go
index f0b4f5a..7d59c99 100644
--- a/sandbox/plc4go/internal/plc4go/plc_field_handler.go
+++ b/sandbox/plc4go/internal/plc4go/spi/PlcFieldHandler.go
@@ -16,12 +16,12 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package plc4go
+package spi
 
 import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
 
 type PlcFieldHandler interface {
 
 	// Parser function to parse query strings for a given driver and produce PlcField instances from that
-	ParseQuery(query string) model.PlcField
+	ParseQuery(query string) (model.PlcField, error)
 }
diff --git a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go b/sandbox/plc4go/internal/plc4go/spi/PlcValueHandler.go
similarity index 81%
copy from sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
copy to sandbox/plc4go/internal/plc4go/spi/PlcValueHandler.go
index 66f5a24..a66b096 100644
--- a/sandbox/plc4go/internal/plc4go/modbus/ModbusDriver.go
+++ b/sandbox/plc4go/internal/plc4go/spi/PlcValueHandler.go
@@ -16,10 +16,10 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package modbus
+package spi
 
-import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go"
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
 
-func NewModbusDriver() plc4go.PlcDriver {
-	return nil
+type PlcValueHandler interface {
+	NewPlcValue(typeName string, value interface{}) (values.PlcValue, error)
 }
diff --git a/sandbox/plc4go/internal/plc4go/model/plc_reader.go b/sandbox/plc4go/internal/plc4go/spi/model/PlcReadRequest.go
similarity index 81%
rename from sandbox/plc4go/internal/plc4go/model/plc_reader.go
rename to sandbox/plc4go/internal/plc4go/spi/model/PlcReadRequest.go
index 15e85af..4de764b 100644
--- a/sandbox/plc4go/internal/plc4go/model/plc_reader.go
+++ b/sandbox/plc4go/internal/plc4go/spi/model/PlcReadRequest.go
@@ -20,6 +20,13 @@ package model
 
 import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
 
-type PlcReader interface {
-	Read() (<-chan model.PlcReadResponse, error)
+type PlcReadRequest struct {
+	fields map[string]model.PlcField
+	model.PlcReadRequest
+}
+
+func NewPlcReadRequest(fields map[string]model.PlcField) PlcReadRequest {
+	return PlcReadRequest{
+		fields: fields,
+	}
 }
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_list.go b/sandbox/plc4go/internal/plc4go/spi/values/PlcList.go
similarity index 81%
rename from sandbox/plc4go/pkg/plc4go/values/plc_list.go
rename to sandbox/plc4go/internal/plc4go/spi/values/PlcList.go
index 02e8d61..6a52f84 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_list.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/PlcList.go
@@ -18,14 +18,16 @@
 //
 package values
 
+import api "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
+
 type PlcList struct {
-	values []PlcValue
-	plcValueAdapter
+	values []api.PlcValue
+	PlcValueAdapter
 }
 
 func NewPlcList() PlcList {
 	return PlcList{
-		values: []PlcValue{},
+		values: []api.PlcValue{},
 	}
 }
 
@@ -37,10 +39,10 @@ func (m PlcList) GetLength() int {
 	return len(m.values)
 }
 
-func (m PlcList) GetIndex(i int) PlcValue {
+func (m PlcList) GetIndex(i int) api.PlcValue {
 	return m.values[i]
 }
 
-func (m PlcList) GetList() []PlcValue {
+func (m PlcList) GetList() []api.PlcValue {
 	return m.values
 }
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_simple_value.go b/sandbox/plc4go/internal/plc4go/spi/values/PlcSimpleValueAdapter.go
similarity index 55%
rename from sandbox/plc4go/pkg/plc4go/values/plc_simple_value.go
rename to sandbox/plc4go/internal/plc4go/spi/values/PlcSimpleValueAdapter.go
index 2e81e31..60e28ab 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_simple_value.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/PlcSimpleValueAdapter.go
@@ -18,62 +18,62 @@
 //
 package values
 
-type plcSimpleValueAdapter struct {
-	plcValueAdapter
+type PlcSimpleValueAdapter struct {
+	PlcValueAdapter
 }
 
-func (m plcSimpleValueAdapter) IsSimple() bool {
+func (m PlcSimpleValueAdapter) IsSimple() bool {
 	return true
 }
 
-func (m plcSimpleValueAdapter) GetLength() int {
+func (m PlcSimpleValueAdapter) GetLength() uint32 {
 	return 1
 }
 
-type plcSimpleNumericValueAdapter struct {
-	plcSimpleValueAdapter
+type PlcSimpleNumericValueAdapter struct {
+	PlcSimpleValueAdapter
 }
 
-func (m plcSimpleNumericValueAdapter) IsBoolean() bool {
+func (m PlcSimpleNumericValueAdapter) IsBoolean() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUint8() bool {
+func (m PlcSimpleNumericValueAdapter) IsUint8() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUint16() bool {
+func (m PlcSimpleNumericValueAdapter) IsUint16() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUint32() bool {
+func (m PlcSimpleNumericValueAdapter) IsUint32() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUint64() bool {
+func (m PlcSimpleNumericValueAdapter) IsUint64() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUnt8() bool {
+func (m PlcSimpleNumericValueAdapter) IsUnt8() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUnt16() bool {
+func (m PlcSimpleNumericValueAdapter) IsUnt16() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUnt32() bool {
+func (m PlcSimpleNumericValueAdapter) IsUnt32() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsUnt64() bool {
+func (m PlcSimpleNumericValueAdapter) IsUnt64() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsFloat32() bool {
+func (m PlcSimpleNumericValueAdapter) IsFloat32() bool {
 	return true
 }
 
-func (m plcSimpleNumericValueAdapter) IsFloat64() bool {
+func (m PlcSimpleNumericValueAdapter) IsFloat64() bool {
 	return true
 }
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_struct.go b/sandbox/plc4go/internal/plc4go/spi/values/PlcStruct.go
similarity index 82%
rename from sandbox/plc4go/pkg/plc4go/values/plc_struct.go
rename to sandbox/plc4go/internal/plc4go/spi/values/PlcStruct.go
index 5a91c72..baed6f6 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_struct.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/PlcStruct.go
@@ -18,14 +18,16 @@
 //
 package values
 
+import api "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
+
 type PlcStruct struct {
-	values map[string]PlcValue
-	plcValueAdapter
+	values map[string]api.PlcValue
+	PlcValueAdapter
 }
 
 func NewPlcStruct() PlcStruct {
 	return PlcStruct{
-		values: map[string]PlcValue{},
+		values: map[string]api.PlcValue{},
 	}
 }
 
@@ -48,13 +50,13 @@ func (m PlcStruct) HasKey(key string) bool {
 	return false
 }
 
-func (m PlcStruct) GetValue(key string) PlcValue {
+func (m PlcStruct) GetValue(key string) api.PlcValue {
 	if value, ok := m.values[key]; ok {
 		return value
 	}
 	return nil
 }
 
-func (m PlcStruct) GetStruct() map[string]PlcValue {
+func (m PlcStruct) GetStruct() map[string]api.PlcValue {
 	return m.values
 }
diff --git a/sandbox/plc4go/internal/plc4go/spi/values/PlcValueAdapter.go b/sandbox/plc4go/internal/plc4go/spi/values/PlcValueAdapter.go
new file mode 100644
index 0000000..9d94d06
--- /dev/null
+++ b/sandbox/plc4go/internal/plc4go/spi/values/PlcValueAdapter.go
@@ -0,0 +1,182 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package values
+
+import (
+	api "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
+	"time"
+)
+
+// Dummy structure
+type PlcValueAdapter struct {
+	api.PlcValue
+}
+
+// Simple Types
+func (m PlcValueAdapter) IsSimple() bool {
+	return false
+}
+func (m PlcValueAdapter) IsNullable() bool {
+	return false
+}
+func (m PlcValueAdapter) IsNull() bool {
+	return false
+}
+
+// Boolean
+func (m PlcValueAdapter) IsBoolean() bool {
+	return false
+}
+func (m PlcValueAdapter) GetBooleanLength() uint32 {
+	return 1
+}
+func (m PlcValueAdapter) GetBoolean() bool {
+	return false
+}
+func (m PlcValueAdapter) GetBooleanAt(index uint32) bool {
+	if index == 0 {
+		return m.GetBoolean()
+	}
+	return false
+}
+func (m PlcValueAdapter) GetBooleanArray() []bool {
+	return nil
+}
+
+// Integer
+func (m PlcValueAdapter) IsUint8() bool {
+	return false
+}
+func (m PlcValueAdapter) GetUint8() uint8 {
+	return 0
+}
+func (m PlcValueAdapter) IsUint16() bool {
+	return false
+}
+func (m PlcValueAdapter) GetUint16() uint16 {
+	return 0
+}
+func (m PlcValueAdapter) IsUint32() bool {
+	return false
+}
+func (m PlcValueAdapter) GetUint32() uint32 {
+	return 0
+}
+func (m PlcValueAdapter) IsUint64() bool {
+	return false
+}
+func (m PlcValueAdapter) GetUint64() uint64 {
+	return 0
+}
+func (m PlcValueAdapter) IsInt8() bool {
+	return false
+}
+func (m PlcValueAdapter) GetInt8() int8 {
+	return 0
+}
+func (m PlcValueAdapter) IsInt16() bool {
+	return false
+}
+func (m PlcValueAdapter) GetInt16() int16 {
+	return 0
+}
+func (m PlcValueAdapter) IsInt32() bool {
+	return false
+}
+func (m PlcValueAdapter) GetInt32() int32 {
+	return 0
+}
+func (m PlcValueAdapter) IsInt64() bool {
+	return false
+}
+func (m PlcValueAdapter) GetInt64() int64 {
+	return 0
+}
+
+// Floating Point
+func (m PlcValueAdapter) IsFloat32() bool {
+	return false
+}
+func (m PlcValueAdapter) GetFloat32() float32 {
+	return 0.0
+}
+func (m PlcValueAdapter) IsFloat64() bool {
+	return false
+}
+func (m PlcValueAdapter) GetFloat64() float64 {
+	return 0.0
+}
+
+// String
+func (m PlcValueAdapter) IsString() bool {
+	return false
+}
+func (m PlcValueAdapter) GetString() string {
+	return ""
+}
+
+// Time
+func (m PlcValueAdapter) IsTime() bool {
+	return false
+}
+func (m PlcValueAdapter) GetTime() time.Time {
+	return time.Time{}
+}
+func (m PlcValueAdapter) IsDuration() bool {
+	return false
+}
+func (m PlcValueAdapter) GetDuration() time.Duration {
+	return 0
+}
+
+// Raw Access
+func (m PlcValueAdapter) GetRaw() []byte {
+	return nil
+}
+
+// List Methods
+func (m PlcValueAdapter) IsList() bool {
+	return false
+}
+func (m PlcValueAdapter) GetLength() uint32 {
+	return 0
+}
+func (m PlcValueAdapter) GetIndex(i uint32) api.PlcValue {
+	return nil
+}
+func (m PlcValueAdapter) GetList() []api.PlcValue {
+	return nil
+}
+
+// Struct Methods
+func (m PlcValueAdapter) IsStruct() bool {
+	return false
+}
+func (m PlcValueAdapter) GetKeys() []string {
+	return []string{}
+}
+func (m PlcValueAdapter) HasKey(key string) bool {
+	return false
+}
+func (m PlcValueAdapter) GetValue(key string) api.PlcValue {
+	return nil
+}
+func (m PlcValueAdapter) GetStruct() map[string]api.PlcValue {
+	return nil
+}
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_BOOL.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/BOOL.go
similarity index 79%
rename from sandbox/plc4go/pkg/plc4go/values/plc_BOOL.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/BOOL.go
index 11a2101..08ed846 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_BOOL.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/BOOL.go
@@ -16,11 +16,15 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcBOOL struct {
 	value bool
-	plcValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcBOOL(value bool) PlcBOOL {
@@ -33,7 +37,7 @@ func (m PlcBOOL) IsBoolean() bool {
 	return true
 }
 
-func (m PlcBOOL) GetBooleanLength() uint8 {
+func (m PlcBOOL) GetBooleanLength() uint32 {
 	return 1
 }
 
@@ -41,6 +45,13 @@ func (m PlcBOOL) GetBoolean() bool {
 	return m.value
 }
 
+func (m PlcBOOL) GetBooleanAt(index uint32) bool {
+	if index == 0 {
+		return m.value
+	}
+	return false
+}
+
 func (m PlcBOOL) GetBooleanArray() []bool {
 	return []bool{m.value}
 }
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_BYTE.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/BYTE.go
similarity index 85%
rename from sandbox/plc4go/pkg/plc4go/values/plc_BYTE.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/BYTE.go
index 17f5a55..0f6cb6d 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_BYTE.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/BYTE.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcBYTE struct {
 	value uint8
-	plcValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcBYTE(value uint8) PlcBYTE {
@@ -33,7 +35,7 @@ func (m PlcBYTE) IsBoolean() bool {
 	return true
 }
 
-func (m PlcBYTE) GetBooleanLength() uint8 {
+func (m PlcBYTE) GetBooleanLength() uint32 {
 	return 8
 }
 
@@ -41,7 +43,7 @@ func (m PlcBYTE) GetBoolean() bool {
 	return m.value&1 == 1
 }
 
-func (m PlcBYTE) GetBooleanAt(index uint8) bool {
+func (m PlcBYTE) GetBooleanAt(index uint32) bool {
 	if index > 7 {
 		return false
 	}
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_CHAR.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/CHAR.go
similarity index 89%
rename from sandbox/plc4go/pkg/plc4go/values/plc_CHAR.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/CHAR.go
index 353439f..40ee2b9 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_CHAR.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/CHAR.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcCHAR struct {
 	value []byte
-	plcSimpleValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcCHAR(value uint8) PlcCHAR {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_DATE.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_DATE.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE.go
index 9fc10a3..b5c282f 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_DATE.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE.go
@@ -16,18 +16,22 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "time"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"time"
+)
 
 type PlcDATE struct {
 	value time.Time
+	values.PlcValueAdapter
 }
 
 func NewPlcDATE(value time.Time) PlcDATE {
 	safeValue := time.Date(value.Year(), value.Month(), value.Day(), 0, 0, 0, 0, value.Location())
 	return PlcDATE{
-		safeValue,
+		value: safeValue,
 	}
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_DATE_AND_TIME.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE_AND_TIME.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_DATE_AND_TIME.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE_AND_TIME.go
index 2dd82f8..30aa13a 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_DATE_AND_TIME.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DATE_AND_TIME.go
@@ -16,17 +16,21 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "time"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"time"
+)
 
 type PlcDATEANDTIME struct {
 	value time.Time
+	values.PlcValueAdapter
 }
 
 func NewPlcDATEANDTIME(value time.Time) PlcDATEANDTIME {
 	return PlcDATEANDTIME{
-		value,
+		value: value,
 	}
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_DINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DINT.go
similarity index 94%
rename from sandbox/plc4go/pkg/plc4go/values/plc_DINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/DINT.go
index 593ea2b..d72a03b 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_DINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcDINT struct {
 	value int32
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcDINT(value int32) PlcDINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_DWORD.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DWORD.go
similarity index 89%
rename from sandbox/plc4go/pkg/plc4go/values/plc_DWORD.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/DWORD.go
index bb37af7..cc63ac6 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_DWORD.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/DWORD.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcDWORD struct {
 	value uint32
-	plcValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcDWORD(value uint32) PlcDWORD {
@@ -33,7 +35,7 @@ func (m PlcDWORD) IsBoolean() bool {
 	return true
 }
 
-func (m PlcDWORD) GetBooleanLength() uint8 {
+func (m PlcDWORD) GetBooleanLength() uint32 {
 	return 32
 }
 
@@ -41,7 +43,7 @@ func (m PlcDWORD) GetBoolean() bool {
 	return m.value&1 == 1
 }
 
-func (m PlcDWORD) GetBooleanAt(index uint8) bool {
+func (m PlcDWORD) GetBooleanAt(index uint32) bool {
 	if index > 31 {
 		return false
 	}
diff --git a/sandbox/plc4go/internal/plc4go/spi/values/iec61131/IEC61131ValueHandler.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/IEC61131ValueHandler.go
new file mode 100644
index 0000000..820806b
--- /dev/null
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/IEC61131ValueHandler.go
@@ -0,0 +1,224 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package iec61131
+
+import (
+	"errors"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
+	"reflect"
+	"time"
+)
+
+const (
+	// Bit & Bit-Strings
+	IEC61131_BOOL  string = "IEC61131_BOOL"
+	IEC61131_BYTE  string = "IEC61131_BYTE"
+	IEC61131_WORD  string = "IEC61131_WORD"
+	IEC61131_DWORD string = "IEC61131_DWORD"
+	IEC61131_LWORD string = "IEC61131_LWORD"
+
+	// Integers
+	IEC61131_USINT string = "IEC61131_USINT"
+	IEC61131_UINT  string = "IEC61131_UINT"
+	IEC61131_UDINT string = "IEC61131_UDINT"
+	IEC61131_ULINT string = "IEC61131_ULINT"
+	IEC61131_SINT  string = "IEC61131_SINT"
+	IEC61131_INT   string = "IEC61131_INT"
+	IEC61131_DINT  string = "IEC61131_DINT"
+	IEC61131_LINT  string = "IEC61131_LINT"
+
+	// Floating Point Values
+	IEC61131_REAL  string = "IEC61131_REAL"
+	IEC61131_LREAL string = "IEC61131_LREAL"
+
+	// Temporal Values
+	IEC61131_TIME          string = "IEC61131_TIME"
+	IEC61131_DATE          string = "IEC61131_DATE"
+	IEC61131_TIME_OF_DAY   string = "IEC61131_TIME_OF_DAY"
+	IEC61131_DATE_AND_TIME string = "IEC61131_DATE_AND_TIME"
+
+	// Chars and Strings
+	IEC61131_CHAR    string = "IEC61131_CHAR"
+	IEC61131_WCHAR   string = "IEC61131_WCHAR"
+	IEC61131_STRING  string = "IEC61131_STRING"
+	IEC61131_WSTRING string = "IEC61131_WSTRING"
+)
+
+type IEC61131ValueHandler struct {
+	spi.PlcValueHandler
+}
+
+func NewIEC61131ValueHandler() IEC61131ValueHandler {
+	return IEC61131ValueHandler{}
+}
+
+func (m IEC61131ValueHandler) NewPlcValue(typeName string, value interface{}) (values.PlcValue, error) {
+	switch typeName {
+	// Bit & Bit-Strings
+	case IEC61131_BOOL:
+		casted, ok := value.(bool)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to bool")
+		}
+		return NewPlcBOOL(casted), nil
+	case IEC61131_BYTE:
+		casted, ok := value.(uint8)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint8")
+		}
+		return NewPlcBYTE(casted), nil
+	case IEC61131_WORD:
+		casted, ok := value.(uint16)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint16")
+		}
+		return NewPlcWORD(casted), nil
+	case IEC61131_DWORD:
+		casted, ok := value.(uint32)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint32")
+		}
+		return NewPlcDWORD(casted), nil
+	case IEC61131_LWORD:
+		casted, ok := value.(uint64)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint64")
+		}
+		return NewPlcLWORD(casted), nil
+
+	// Integers
+	case IEC61131_USINT:
+		casted, ok := value.(uint8)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint8")
+		}
+		return NewPlcUSINT(casted), nil
+	case IEC61131_UINT:
+		casted, ok := value.(uint16)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint16")
+		}
+		return NewPlcUINT(casted), nil
+	case IEC61131_UDINT:
+		casted, ok := value.(uint32)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint32")
+		}
+		return NewPlcUDINT(casted), nil
+	case IEC61131_ULINT:
+		casted, ok := value.(uint64)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint64")
+		}
+		return NewPlcULINT(casted), nil
+	case IEC61131_SINT:
+		casted, ok := value.(int8)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to int8")
+		}
+		return NewPlcSINT(casted), nil
+	case IEC61131_INT:
+		casted, ok := value.(int16)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to int16")
+		}
+		return NewPlcINT(casted), nil
+	case IEC61131_DINT:
+		casted, ok := value.(int32)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to int32")
+		}
+		return NewPlcDINT(casted), nil
+	case IEC61131_LINT:
+		casted, ok := value.(int64)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to int64")
+		}
+		return NewPlcLINT(casted), nil
+
+	// Floating Point Values
+	case IEC61131_REAL:
+		casted, ok := value.(float32)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to float32")
+		}
+		return NewPlcREAL(casted), nil
+	case IEC61131_LREAL:
+		casted, ok := value.(float64)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to float64")
+		}
+		return NewPlcLREAL(casted), nil
+
+	// Temporal Values
+	case IEC61131_TIME:
+		casted, ok := value.(uint32)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint32")
+		}
+		return NewPlcTIME(casted), nil
+	case IEC61131_DATE:
+		casted, ok := value.(time.Time)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to time.Time")
+		}
+		return NewPlcDATE(casted), nil
+	case IEC61131_TIME_OF_DAY:
+		casted, ok := value.(time.Time)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to time.Time")
+		}
+		return NewPlcTIMEOFDAY(casted), nil
+	case IEC61131_DATE_AND_TIME:
+		casted, ok := value.(time.Time)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to time.Time")
+		}
+		return NewPlcDATEANDTIME(casted), nil
+
+	// Chars and Strings
+	case IEC61131_CHAR:
+		casted, ok := value.(uint8)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint8")
+		}
+		return NewPlcCHAR(casted), nil
+	case IEC61131_WCHAR:
+		casted, ok := value.(uint16)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to uint16")
+		}
+		return NewPlcWCHAR(casted), nil
+	case IEC61131_STRING:
+		casted, ok := value.([]uint8)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to []uint8")
+		}
+		return NewPlcSTRING(casted), nil
+	case IEC61131_WSTRING:
+		casted, ok := value.([]uint16)
+		if !ok {
+			return nil, errors.New("couldn't cast value of type " + reflect.TypeOf(value).Name() + " to []uint16")
+		}
+		return NewPlcWSTRING(casted), nil
+	}
+
+	return nil, errors.New("Unsupported type " + typeName)
+}
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_INT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/INT.go
similarity index 93%
rename from sandbox/plc4go/pkg/plc4go/values/plc_INT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/INT.go
index 5ae718d..e053dcc 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_INT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/INT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcINT struct {
 	value int16
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcINT(value int16) PlcINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_LINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LINT.go
similarity index 94%
rename from sandbox/plc4go/pkg/plc4go/values/plc_LINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/LINT.go
index d850c0e..798c7d9 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_LINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcLINT struct {
 	value int64
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcLINT(value int64) PlcLINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_LREAL.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LREAL.go
similarity index 95%
rename from sandbox/plc4go/pkg/plc4go/values/plc_LREAL.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/LREAL.go
index 624e375..9626702 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_LREAL.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LREAL.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcLREAL struct {
 	value float64
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcLREAL(value float64) PlcLREAL {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_LTIME.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LTIME.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_LTIME.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/LTIME.go
index 68b394b..71fa5e9 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_LTIME.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LTIME.go
@@ -16,20 +16,21 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "time"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"time"
+)
 
 type PlcLTIME struct {
-	PlcULINT
+	value uint64
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcLTIME(value uint64) PlcLTIME {
-	child := PlcULINT{
-		value: value,
-	}
 	return PlcLTIME{
-		child,
+		value: value,
 	}
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_LWORD.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LWORD.go
similarity index 91%
rename from sandbox/plc4go/pkg/plc4go/values/plc_LWORD.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/LWORD.go
index 768f85c..9b88f17 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_LWORD.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/LWORD.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcLWORD struct {
 	value uint64
-	plcValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcLWORD(value uint64) PlcLWORD {
@@ -33,7 +35,7 @@ func (m PlcLWORD) IsBoolean() bool {
 	return true
 }
 
-func (m PlcLWORD) GetBooleanLength() uint8 {
+func (m PlcLWORD) GetBooleanLength() uint32 {
 	return 64
 }
 
@@ -41,7 +43,7 @@ func (m PlcLWORD) GetBoolean() bool {
 	return m.value&1 == 1
 }
 
-func (m PlcLWORD) GetBooleanAt(index uint8) bool {
+func (m PlcLWORD) GetBooleanAt(index uint32) bool {
 	if index > 63 {
 		return false
 	}
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_NULL.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/NULL.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_NULL.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/NULL.go
index 853a285..c56fb62 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_NULL.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/NULL.go
@@ -16,10 +16,12 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcNULL struct {
-	plcValueAdapter
+	values.PlcValueAdapter
 }
 
 func NewPlcNULL() PlcNULL {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_REAL.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/REAL.go
similarity index 94%
rename from sandbox/plc4go/pkg/plc4go/values/plc_REAL.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/REAL.go
index 8f2519c..e43b164 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_REAL.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/REAL.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcREAL struct {
 	value float32
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcREAL(value float32) PlcREAL {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_SINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/SINT.go
similarity index 93%
rename from sandbox/plc4go/pkg/plc4go/values/plc_SINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/SINT.go
index 1a09741..a376a57 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_SINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/SINT.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcSINT struct {
 	value int8
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcSINT(value int8) PlcSINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_STRING.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/STRING.go
similarity index 89%
rename from sandbox/plc4go/pkg/plc4go/values/plc_STRING.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/STRING.go
index 82d42d9..4b69eed 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_STRING.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/STRING.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcSTRING struct {
 	value []byte
-	plcSimpleValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcSTRING(value []uint8) PlcSTRING {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_TIME.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_TIME.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME.go
index d97dbaf..3d1253e 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_TIME.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME.go
@@ -16,20 +16,21 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "time"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"time"
+)
 
 type PlcTIME struct {
-	PlcUDINT
+	value uint32
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcTIME(value uint32) PlcTIME {
-	child := PlcUDINT{
-		value: value,
-	}
 	return PlcTIME{
-		child,
+		value: value,
 	}
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_TIME_OF_DAY.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME_OF_DAY.go
similarity index 84%
rename from sandbox/plc4go/pkg/plc4go/values/plc_TIME_OF_DAY.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME_OF_DAY.go
index 7add3d0..c2fcb6b 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_TIME_OF_DAY.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/TIME_OF_DAY.go
@@ -16,18 +16,22 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "time"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"time"
+)
 
 type PlcTIMEOFDAY struct {
 	value time.Time
+	values.PlcSimpleValueAdapter
 }
 
-func NewPlcTIME_OF_DAY(value time.Time) PlcTIMEOFDAY {
+func NewPlcTIMEOFDAY(value time.Time) PlcTIMEOFDAY {
 	safeValue := time.Date(0, 0, 0, value.Hour(), value.Minute(), value.Second(), value.Nanosecond(), value.Location())
 	return PlcTIMEOFDAY{
-		safeValue,
+		value: safeValue,
 	}
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_UDINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/UDINT.go
similarity index 93%
rename from sandbox/plc4go/pkg/plc4go/values/plc_UDINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/UDINT.go
index 082661b..7e53158 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_UDINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/UDINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcUDINT struct {
 	value uint32
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcUDINT(value uint32) PlcUDINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_UINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/UINT.go
similarity index 93%
rename from sandbox/plc4go/pkg/plc4go/values/plc_UINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/UINT.go
index 27f9075..55b90d1 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_UINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/UINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcUINT struct {
 	value uint16
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcUINT(value uint16) PlcUINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_ULINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/ULINT.go
similarity index 94%
rename from sandbox/plc4go/pkg/plc4go/values/plc_ULINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/ULINT.go
index cf134ac..97de4c8 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_ULINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/ULINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcULINT struct {
 	value uint64
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcULINT(value uint64) PlcULINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_USINT.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/USINT.go
similarity index 92%
rename from sandbox/plc4go/pkg/plc4go/values/plc_USINT.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/USINT.go
index 71c4eda..9c6da1b 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_USINT.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/USINT.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "math"
+import (
+	"math"
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+)
 
 type PlcUSINT struct {
 	value uint8
-	plcSimpleNumericValueAdapter
+	values.PlcSimpleNumericValueAdapter
 }
 
 func NewPlcUSINT(value uint8) PlcUSINT {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_WCHAR.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WCHAR.go
similarity index 90%
rename from sandbox/plc4go/pkg/plc4go/values/plc_WCHAR.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/WCHAR.go
index f719abd..29bb2f7 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_WCHAR.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WCHAR.go
@@ -16,15 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
 import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 	"unicode/utf16"
 )
 
 type PlcWCHAR struct {
 	value []rune
-	plcSimpleValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcWCHAR(value uint16) PlcWCHAR {
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_WORD.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WORD.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_WORD.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/WORD.go
index 7cbda29..d459d60 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_WORD.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WORD.go
@@ -16,11 +16,13 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
+
+import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
 
 type PlcWORD struct {
 	value uint16
-	plcValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcWORD(value uint16) PlcWORD {
@@ -33,7 +35,7 @@ func (m PlcWORD) IsBoolean() bool {
 	return true
 }
 
-func (m PlcWORD) GetBooleanLength() uint8 {
+func (m PlcWORD) GetBooleanLength() uint32 {
 	return 16
 }
 
@@ -41,7 +43,7 @@ func (m PlcWORD) GetBoolean() bool {
 	return m.value&1 == 1
 }
 
-func (m PlcWORD) GetBooleanAt(index uint8) bool {
+func (m PlcWORD) GetBooleanAt(index uint32) bool {
 	if index > 15 {
 		return false
 	}
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_WSTRING.go b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WSTRING.go
similarity index 87%
rename from sandbox/plc4go/pkg/plc4go/values/plc_WSTRING.go
rename to sandbox/plc4go/internal/plc4go/spi/values/iec61131/WSTRING.go
index b37b992..14c5566 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_WSTRING.go
+++ b/sandbox/plc4go/internal/plc4go/spi/values/iec61131/WSTRING.go
@@ -16,13 +16,16 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package values
+package iec61131
 
-import "unicode/utf16"
+import (
+	"plc4x.apache.org/plc4go-modbus-driver/0.8.0/internal/plc4go/spi/values"
+	"unicode/utf16"
+)
 
 type PlcWSTRING struct {
 	value []rune
-	plcSimpleValueAdapter
+	values.PlcSimpleValueAdapter
 }
 
 func NewPlcWSTRING(value []uint16) PlcWSTRING {
diff --git a/sandbox/plc4go/pkg/plc4go/driver.go b/sandbox/plc4go/pkg/plc4go/driver.go
index 4693938..5e6612e 100644
--- a/sandbox/plc4go/pkg/plc4go/driver.go
+++ b/sandbox/plc4go/pkg/plc4go/driver.go
@@ -18,8 +18,6 @@
 //
 package plc4go
 
-import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/model"
-
 type PlcDriverResult struct {
 	Driver PlcDriver
 	Err    error
@@ -38,9 +36,8 @@ type PlcDriver interface {
 	// Get a human readable name for this driver
 	GetProtocolName() string
 
+	CheckQuery(query string) error
+
 	// Establishes a connection to a given PLC using the information in the connectionString
 	GetConnection(connectionString string) (PlcConnection, error)
-
-	// Parses a given query string and produces PlcField instances for this driver implementation
-	PrepareField(query string) (model.PlcField, error)
 }
diff --git a/sandbox/plc4go/pkg/plc4go/model/plc_field.go b/sandbox/plc4go/pkg/plc4go/model/plc_field.go
index 01f62f2..f809c31 100644
--- a/sandbox/plc4go/pkg/plc4go/model/plc_field.go
+++ b/sandbox/plc4go/pkg/plc4go/model/plc_field.go
@@ -19,4 +19,5 @@
 package model
 
 type PlcField interface {
+	GetTypeName() string
 }
diff --git a/sandbox/plc4go/pkg/plc4go/model/plc_read_request.go b/sandbox/plc4go/pkg/plc4go/model/plc_read_request.go
index 7e325a9..09fced2 100644
--- a/sandbox/plc4go/pkg/plc4go/model/plc_read_request.go
+++ b/sandbox/plc4go/pkg/plc4go/model/plc_read_request.go
@@ -19,7 +19,7 @@
 package model
 
 type PlcReadRequestBuilder interface {
-	AddField(name string, query string) *PlcReadRequestBuilder
+	AddField(name string, query string) error
 	Build() (PlcReadRequest, error)
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/model/plc_write_request.go b/sandbox/plc4go/pkg/plc4go/model/plc_write_request.go
index c632088..8cab980 100644
--- a/sandbox/plc4go/pkg/plc4go/model/plc_write_request.go
+++ b/sandbox/plc4go/pkg/plc4go/model/plc_write_request.go
@@ -18,10 +18,8 @@
 //
 package model
 
-import "plc4x.apache.org/plc4go-modbus-driver/0.8.0/pkg/plc4go/values"
-
 type PlcWriteRequestBuilder interface {
-	AddField(name string, query string, value values.PlcValue)
+	AddField(name string, query string, value interface{})
 	Build() (PlcWriteRequest, error)
 }
 
diff --git a/sandbox/plc4go/pkg/plc4go/values/plc_value.go b/sandbox/plc4go/pkg/plc4go/values/plc_value.go
index b32bc33..5a77fdd 100644
--- a/sandbox/plc4go/pkg/plc4go/values/plc_value.go
+++ b/sandbox/plc4go/pkg/plc4go/values/plc_value.go
@@ -29,9 +29,9 @@ type PlcValue interface {
 
 	// Boolean
 	IsBoolean() bool
-	GetBooleanLength() uint8
+	GetBooleanLength() uint32
 	GetBoolean() bool
-	GetBooleanAt(index uint8) bool
+	GetBooleanAt(index uint32) bool
 	GetBooleanArray() []bool
 
 	// Integer
@@ -64,7 +64,7 @@ type PlcValue interface {
 
 	// Time
 	IsTime() bool
-	GetTime()
+	GetTime() time.Time
 	IsDate() bool
 	GetDate()
 	IsDateTime() bool
@@ -86,160 +86,3 @@ type PlcValue interface {
 	GetValue(key string) PlcValue
 	GetStruct() map[string]PlcValue
 }
-
-// Dummy structure
-type plcValueAdapter struct {
-}
-
-// Simple Types
-func (m plcValueAdapter) IsSimple() bool {
-	return false
-}
-func (m plcValueAdapter) IsNullable() bool {
-	return false
-}
-func (m plcValueAdapter) IsNull() bool {
-	return false
-}
-
-// Boolean
-func (m plcValueAdapter) IsBoolean() bool {
-	return false
-}
-func (m plcValueAdapter) GetBooleanLength() uint8 {
-	return 1
-}
-func (m plcValueAdapter) GetBoolean() bool {
-	return false
-}
-func (m plcValueAdapter) GetBooleanAt(index uint8) bool {
-	if index == 0 {
-		return m.GetBoolean()
-	}
-	return false
-}
-func (m plcValueAdapter) GetBooleanArray() []bool {
-	return nil
-}
-
-// Integer
-func (m plcValueAdapter) IsUint8() bool {
-	return false
-}
-func (m plcValueAdapter) GetUint8() uint8 {
-	return 0
-}
-func (m plcValueAdapter) IsUint16() bool {
-	return false
-}
-func (m plcValueAdapter) GetUint16() uint16 {
-	return 0
-}
-func (m plcValueAdapter) IsUint32() bool {
-	return false
-}
-func (m plcValueAdapter) GetUint32() uint32 {
-	return 0
-}
-func (m plcValueAdapter) IsUint64() bool {
-	return false
-}
-func (m plcValueAdapter) GetUint64() uint64 {
-	return 0
-}
-func (m plcValueAdapter) IsInt8() bool {
-	return false
-}
-func (m plcValueAdapter) GetInt8() uint8 {
-	return 0
-}
-func (m plcValueAdapter) IsInt16() bool {
-	return false
-}
-func (m plcValueAdapter) GetInt16() uint16 {
-	return 0
-}
-func (m plcValueAdapter) IsInt32() bool {
-	return false
-}
-func (m plcValueAdapter) GetInt32() uint32 {
-	return 0
-}
-func (m plcValueAdapter) IsInt64() bool {
-	return false
-}
-func (m plcValueAdapter) GetInt64() uint64 {
-	return 0
-}
-
-// Floating Point
-func (m plcValueAdapter) IsFloat32() bool {
-	return false
-}
-func (m plcValueAdapter) GetFloat32() float32 {
-	return 0.0
-}
-func (m plcValueAdapter) IsFloat64() bool {
-	return false
-}
-func (m plcValueAdapter) GetFloat64() float64 {
-	return 0.0
-}
-
-// String
-func (m plcValueAdapter) IsString() bool {
-	return false
-}
-func (m plcValueAdapter) GetString() string {
-	return ""
-}
-
-// Time
-func (m plcValueAdapter) IsTime() bool {
-	return false
-}
-func (m plcValueAdapter) GetTime() time.Time {
-	return time.Time{}
-}
-func (m plcValueAdapter) IsDuration() bool {
-	return false
-}
-func (m plcValueAdapter) GetDuration() time.Duration {
-	return 0
-}
-
-// Raw Access
-func (m plcValueAdapter) GetRaw() []byte {
-	return nil
-}
-
-// List Methods
-func (m plcValueAdapter) IsList() bool {
-	return false
-}
-func (m plcValueAdapter) GetLength() int {
-	return 0
-}
-func (m plcValueAdapter) GetIndex(i int) PlcValue {
-	return nil
-}
-func (m plcValueAdapter) GetList() []PlcValue {
-	return nil
-}
-
-// Struct Methods
-func (m plcValueAdapter) IsStruct() bool {
-	return false
-}
-func (m plcValueAdapter) GetKeys() []string {
-	return []string{}
-}
-func (m plcValueAdapter) HasKey(key string) bool {
-	return false
-}
-func (m plcValueAdapter) GetValue(key string) PlcValue {
-	return nil
-}
-func (m plcValueAdapter) GetStruct() map[string]PlcValue {
-	return nil
-}