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 2021/01/17 11:36:00 UTC

[plc4x] branch develop updated: - Minor updates (Generally the order of imports so a reformat doesn't change the files too much)

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new d66c60d  - Minor updates (Generally the order of imports so a reformat doesn't change the files too much)
d66c60d is described below

commit d66c60db9489ab3d6496fe2a658b5efda211325f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Jan 17 12:35:48 2021 +0100

    - Minor updates (Generally the order of imports so a reformat doesn't change the files too much)
---
 .../language/go/GoLanguageTemplateHelper.java      |    6 +-
 plc4go/cmd/main/drivers/knxnetip_test.go           |   35 +-
 .../plc4go/bacnetip/readwrite/model/APDU.go        |  433 ++++---
 .../plc4go/bacnetip/readwrite/model/APDUAbort.go   |  348 +++--
 .../bacnetip/readwrite/model/APDUComplexAck.go     |  544 ++++----
 .../readwrite/model/APDUConfirmedRequest.go        |  706 ++++++-----
 .../plc4go/bacnetip/readwrite/model/APDUError.go   |  292 +++--
 .../plc4go/bacnetip/readwrite/model/APDUReject.go  |  294 +++--
 .../bacnetip/readwrite/model/APDUSegmentAck.go     |  456 ++++---
 .../bacnetip/readwrite/model/APDUSimpleAck.go      |  294 +++--
 .../readwrite/model/APDUUnconfirmedRequest.go      |  238 ++--
 .../bacnetip/readwrite/model/BACnetAddress.go      |  241 ++--
 .../readwrite/model/BACnetConfirmedServiceACK.go   |  601 +++++----
 .../BACnetConfirmedServiceACKAtomicReadFile.go     |  130 +-
 .../BACnetConfirmedServiceACKAtomicWriteFile.go    |  130 +-
 ...tConfirmedServiceACKConfirmedPrivateTransfer.go |  130 +-
 .../model/BACnetConfirmedServiceACKCreateObject.go |  130 +-
 .../BACnetConfirmedServiceACKGetAlarmSummary.go    |  130 +-
 ...ACnetConfirmedServiceACKGetEnrollmentSummary.go |  130 +-
 ...BACnetConfirmedServiceACKGetEventInformation.go |  130 +-
 .../model/BACnetConfirmedServiceACKReadProperty.go |  130 +-
 ...ACnetConfirmedServiceACKReadPropertyMultiple.go |  130 +-
 .../model/BACnetConfirmedServiceACKReadRange.go    |  130 +-
 ...BACnetConfirmedServiceACKRemovedAuthenticate.go |  130 +-
 ...rmedServiceACKRemovedReadPropertyConditional.go |  130 +-
 .../model/BACnetConfirmedServiceACKVTData.go       |  130 +-
 .../model/BACnetConfirmedServiceACKVTOpen.go       |  130 +-
 .../model/BACnetConfirmedServiceRequest.go         | 1077 ++++++++--------
 ...ACnetConfirmedServiceRequestAcknowledgeAlarm.go |  130 +-
 .../BACnetConfirmedServiceRequestAddListElement.go |  130 +-
 .../BACnetConfirmedServiceRequestAtomicReadFile.go |  130 +-
 ...BACnetConfirmedServiceRequestAtomicWriteFile.go |  130 +-
 ...firmedServiceRequestConfirmedCOVNotification.go |  850 +++++++------
 ...rviceRequestConfirmedCOVNotificationMultiple.go |  130 +-
 ...rmedServiceRequestConfirmedEventNotification.go |  130 +-
 ...firmedServiceRequestConfirmedPrivateTransfer.go |  130 +-
 ...tConfirmedServiceRequestConfirmedTextMessage.go |  130 +-
 .../BACnetConfirmedServiceRequestCreateObject.go   |  130 +-
 .../BACnetConfirmedServiceRequestDeleteObject.go   |  130 +-
 ...rmedServiceRequestDeviceCommunicationControl.go |  130 +-
 ...tConfirmedServiceRequestGetEnrollmentSummary.go |  130 +-
 ...etConfirmedServiceRequestGetEventInformation.go |  130 +-
 ...etConfirmedServiceRequestLifeSafetyOperation.go |  130 +-
 .../BACnetConfirmedServiceRequestReadProperty.go   |  458 ++++---
 ...tConfirmedServiceRequestReadPropertyMultiple.go |  130 +-
 .../BACnetConfirmedServiceRequestReadRange.go      |  130 +-
 ...netConfirmedServiceRequestReinitializeDevice.go |  130 +-
 ...CnetConfirmedServiceRequestRemoveListElement.go |  130 +-
 ...etConfirmedServiceRequestRemovedAuthenticate.go |  130 +-
 ...ServiceRequestRemovedReadPropertyConditional.go |  130 +-
 ...CnetConfirmedServiceRequestRemovedRequestKey.go |  130 +-
 .../BACnetConfirmedServiceRequestSubscribeCOV.go   |  668 +++++-----
 ...tConfirmedServiceRequestSubscribeCOVProperty.go |  130 +-
 ...edServiceRequestSubscribeCOVPropertyMultiple.go |  130 +-
 .../model/BACnetConfirmedServiceRequestVTClose.go  |  130 +-
 .../model/BACnetConfirmedServiceRequestVTData.go   |  130 +-
 .../model/BACnetConfirmedServiceRequestVTOpen.go   |  130 +-
 .../BACnetConfirmedServiceRequestWriteProperty.go  |  658 +++++-----
 ...ConfirmedServiceRequestWritePropertyMultiple.go |  130 +-
 .../plc4go/bacnetip/readwrite/model/BACnetError.go |  601 +++++----
 .../readwrite/model/BACnetErrorAtomicReadFile.go   |  130 +-
 .../readwrite/model/BACnetErrorAtomicWriteFile.go  |  130 +-
 .../model/BACnetErrorConfirmedPrivateTransfer.go   |  130 +-
 .../readwrite/model/BACnetErrorCreateObject.go     |  130 +-
 .../readwrite/model/BACnetErrorGetAlarmSummary.go  |  130 +-
 .../model/BACnetErrorGetEnrollmentSummary.go       |  130 +-
 .../model/BACnetErrorGetEventInformation.go        |  130 +-
 .../readwrite/model/BACnetErrorReadProperty.go     |  492 ++++----
 .../model/BACnetErrorReadPropertyMultiple.go       |  130 +-
 .../readwrite/model/BACnetErrorReadRange.go        |  130 +-
 .../model/BACnetErrorRemovedAuthenticate.go        |  130 +-
 .../BACnetErrorRemovedReadPropertyConditional.go   |  130 +-
 .../bacnetip/readwrite/model/BACnetErrorVTData.go  |  130 +-
 .../bacnetip/readwrite/model/BACnetErrorVTOpen.go  |  130 +-
 .../bacnetip/readwrite/model/BACnetServiceAck.go   |  601 +++++----
 .../model/BACnetServiceAckAtomicReadFile.go        |  130 +-
 .../model/BACnetServiceAckAtomicWriteFile.go       |  130 +-
 .../BACnetServiceAckConfirmedPrivateTransfer.go    |  130 +-
 .../model/BACnetServiceAckCreateObject.go          |  130 +-
 .../model/BACnetServiceAckGetAlarmSummary.go       |  130 +-
 .../model/BACnetServiceAckGetEnrollmentSummary.go  |  130 +-
 .../model/BACnetServiceAckGetEventInformation.go   |  130 +-
 .../model/BACnetServiceAckReadProperty.go          |  578 +++++----
 .../model/BACnetServiceAckReadPropertyMultiple.go  |  130 +-
 .../readwrite/model/BACnetServiceAckReadRange.go   |  130 +-
 .../model/BACnetServiceAckRemovedAuthenticate.go   |  130 +-
 ...CnetServiceAckRemovedReadPropertyConditional.go |  130 +-
 .../readwrite/model/BACnetServiceAckVTData.go      |  130 +-
 .../readwrite/model/BACnetServiceAckVTOpen.go      |  130 +-
 .../plc4go/bacnetip/readwrite/model/BACnetTag.go   |  845 +++++++------
 .../model/BACnetTagApplicationBitString.go         |  290 +++--
 .../readwrite/model/BACnetTagApplicationBoolean.go |  138 +-
 .../model/BACnetTagApplicationCharacterString.go   |  138 +-
 .../readwrite/model/BACnetTagApplicationDate.go    |  138 +-
 .../readwrite/model/BACnetTagApplicationDouble.go  |  196 ++-
 .../model/BACnetTagApplicationEnumerated.go        |  236 ++--
 .../readwrite/model/BACnetTagApplicationNull.go    |  138 +-
 .../model/BACnetTagApplicationObjectIdentifier.go  |  138 +-
 .../model/BACnetTagApplicationOctetString.go       |  138 +-
 .../readwrite/model/BACnetTagApplicationReal.go    |  196 ++-
 .../model/BACnetTagApplicationSignedInteger.go     |  236 ++--
 .../readwrite/model/BACnetTagApplicationTime.go    |  138 +-
 .../model/BACnetTagApplicationUnsignedInteger.go   |  236 ++--
 .../bacnetip/readwrite/model/BACnetTagContext.go   |  236 ++--
 .../readwrite/model/BACnetTagWithContent.go        |  599 +++++----
 .../model/BACnetUnconfirmedServiceRequest.go       |  545 ++++----
 .../model/BACnetUnconfirmedServiceRequestIAm.go    |  634 +++++-----
 .../model/BACnetUnconfirmedServiceRequestIHave.go  |  130 +-
 ...UnconfirmedServiceRequestTimeSynchronization.go |  130 +-
 ...onfirmedServiceRequestUTCTimeSynchronization.go |  130 +-
 ...rmedServiceRequestUnconfirmedCOVNotification.go |  130 +-
 ...iceRequestUnconfirmedCOVNotificationMultiple.go |  130 +-
 ...edServiceRequestUnconfirmedEventNotification.go |  130 +-
 ...rmedServiceRequestUnconfirmedPrivateTransfer.go |  476 ++++---
 ...onfirmedServiceRequestUnconfirmedTextMessage.go |  130 +-
 .../model/BACnetUnconfirmedServiceRequestWhoHas.go |  526 ++++----
 .../model/BACnetUnconfirmedServiceRequestWhoIs.go  |  492 ++++----
 .../BACnetUnconfirmedServiceRequestWriteGroup.go   |  130 +-
 .../plc4go/bacnetip/readwrite/model/BVLC.go        |  647 +++++-----
 .../model/BVLCDeleteForeignDeviceTableEntry.go     |  130 +-
 .../model/BVLCDistributeBroadcastToNetwork.go      |  130 +-
 .../bacnetip/readwrite/model/BVLCForwardedNPDU.go  |  328 +++--
 .../readwrite/model/BVLCOriginalBroadcastNPDU.go   |  184 ++-
 .../readwrite/model/BVLCOriginalUnicastNPDU.go     |  184 ++-
 .../model/BVLCReadBroadcastDistributionTable.go    |  130 +-
 .../model/BVLCReadBroadcastDistributionTableAck.go |  130 +-
 .../readwrite/model/BVLCReadForeignDeviceTable.go  |  130 +-
 .../model/BVLCReadForeignDeviceTableAck.go         |  130 +-
 .../readwrite/model/BVLCRegisterForeignDevice.go   |  130 +-
 .../plc4go/bacnetip/readwrite/model/BVLCResult.go  |  130 +-
 .../bacnetip/readwrite/model/BVLCSecureBVLL.go     |  130 +-
 .../model/BVLCWideBroadcastDistributionTable.go    |  130 +-
 .../plc4go/bacnetip/readwrite/model/NLM.go         |  341 +++--
 .../readwrite/model/NLMIAmRouterToNetwork.go       |  226 ++--
 .../readwrite/model/NLMWhoIsRouterToNetwork.go     |  226 ++--
 .../plc4go/bacnetip/readwrite/model/NPDU.go        | 1147 +++++++++--------
 plc4go/internal/plc4go/knxnetip/KnxNetIpDriver.go  |   72 +-
 .../internal/plc4go/knxnetip/KnxNetIpSubscriber.go |  208 +--
 .../plc4go/knxnetip/KnxNetIpSubscriptionEvent.go   |    2 +-
 .../plc4go/knxnetip/KnxNetIpValueHandler.go        |   15 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpWriter.go  |   52 +-
 .../plc4go/knxnetip/readwrite/ParserHelper.go      |    2 +-
 .../plc4go/knxnetip/readwrite/XmlParserHelper.go   |    2 +-
 .../plc4go/knxnetip/readwrite/model/CEMI.go        |  853 +++++++------
 .../readwrite/model/CEMIAdditionalInformation.go   |  269 ++--
 .../CEMIAdditionalInformationBusmonitorInfo.go     |  496 ++++----
 .../CEMIAdditionalInformationRelativeTimestamp.go  |  224 ++--
 .../knxnetip/readwrite/model/ConnectionRequest.go  |  292 +++--
 .../model/ConnectionRequestInformation.go          |  303 +++--
 ...ConnectionRequestInformationDeviceManagement.go |  130 +-
 ...ConnectionRequestInformationTunnelConnection.go |  238 ++--
 .../knxnetip/readwrite/model/ConnectionResponse.go |  368 +++---
 .../readwrite/model/ConnectionResponseDataBlock.go |  303 +++--
 .../ConnectionResponseDataBlockDeviceManagement.go |  130 +-
 .../ConnectionResponseDataBlockTunnelConnection.go |  184 ++-
 .../readwrite/model/ConnectionStateRequest.go      |  292 +++--
 .../readwrite/model/ConnectionStateResponse.go     |  242 ++--
 .../knxnetip/readwrite/model/DIBDeviceInfo.go      |  647 +++++-----
 .../knxnetip/readwrite/model/DIBSuppSvcFamilies.go |  279 ++--
 .../knxnetip/readwrite/model/DescriptionRequest.go |  184 ++-
 .../readwrite/model/DescriptionResponse.go         |  240 ++--
 .../readwrite/model/DeviceConfigurationAck.go      |  184 ++-
 .../model/DeviceConfigurationAckDataBlock.go       |  287 +++--
 .../readwrite/model/DeviceConfigurationRequest.go  |  240 ++--
 .../model/DeviceConfigurationRequestDataBlock.go   |  289 +++--
 .../knxnetip/readwrite/model/DeviceStatus.go       |  209 ++-
 .../knxnetip/readwrite/model/DisconnectRequest.go  |  292 +++--
 .../knxnetip/readwrite/model/DisconnectResponse.go |  242 ++--
 .../readwrite/model/HPAIControlEndpoint.go         |  285 +++--
 .../knxnetip/readwrite/model/HPAIDataEndpoint.go   |  285 +++--
 .../readwrite/model/HPAIDiscoveryEndpoint.go       |  285 +++--
 .../plc4go/knxnetip/readwrite/model/IPAddress.go   |  195 ++-
 .../plc4go/knxnetip/readwrite/model/KnxAddress.go  |  259 ++--
 .../knxnetip/readwrite/model/KnxGroupAddress.go    |  269 ++--
 .../readwrite/model/KnxGroupAddress2Level.go       |  244 ++--
 .../readwrite/model/KnxGroupAddress3Level.go       |  298 +++--
 .../readwrite/model/KnxGroupAddressFreeLevel.go    |  190 ++-
 .../readwrite/model/KnxInterfaceObjectProperty.go  |    1 -
 .../knxnetip/readwrite/model/KnxNetIpCore.go       |  190 ++-
 .../readwrite/model/KnxNetIpDeviceManagement.go    |  190 ++-
 .../knxnetip/readwrite/model/KnxNetIpMessage.go    |  761 ++++++-----
 .../knxnetip/readwrite/model/KnxNetIpTunneling.go  |  190 ++-
 .../knxnetip/readwrite/model/KnxNetObjectServer.go |  190 ++-
 .../model/KnxNetRemoteConfigurationAndDiagnosis.go |  190 ++-
 .../readwrite/model/KnxNetRemoteLogging.go         |  190 ++-
 .../plc4go/knxnetip/readwrite/model/LBusmonInd.go  |  394 +++---
 .../plc4go/knxnetip/readwrite/model/LDataCon.go    |  340 +++--
 .../plc4go/knxnetip/readwrite/model/LDataFrame.go  |  597 +++++----
 .../knxnetip/readwrite/model/LDataFrameAck.go      |  142 +--
 .../knxnetip/readwrite/model/LDataFrameData.go     |  988 ++++++++-------
 .../knxnetip/readwrite/model/LDataFrameDataExt.go  | 1042 ++++++++-------
 .../readwrite/model/LDataFramePollingData.go       |  392 +++---
 .../plc4go/knxnetip/readwrite/model/LDataInd.go    |  340 +++--
 .../plc4go/knxnetip/readwrite/model/LDataReq.go    |  340 +++--
 .../knxnetip/readwrite/model/LPollDataCon.go       |  130 +-
 .../knxnetip/readwrite/model/LPollDataReq.go       |  130 +-
 .../plc4go/knxnetip/readwrite/model/LRawCon.go     |  130 +-
 .../plc4go/knxnetip/readwrite/model/LRawInd.go     |  130 +-
 .../plc4go/knxnetip/readwrite/model/LRawReq.go     |  130 +-
 .../plc4go/knxnetip/readwrite/model/MACAddress.go  |  195 ++-
 .../readwrite/model/MFuncPropCommandReq.go         |  130 +-
 .../knxnetip/readwrite/model/MFuncPropCon.go       |  130 +-
 .../readwrite/model/MFuncPropStateReadReq.go       |  130 +-
 .../knxnetip/readwrite/model/MPropInfoInd.go       |  130 +-
 .../knxnetip/readwrite/model/MPropReadCon.go       |  460 ++++---
 .../knxnetip/readwrite/model/MPropReadReq.go       |  406 +++---
 .../knxnetip/readwrite/model/MPropWriteCon.go      |  130 +-
 .../knxnetip/readwrite/model/MPropWriteReq.go      |  130 +-
 .../plc4go/knxnetip/readwrite/model/MResetInd.go   |  130 +-
 .../plc4go/knxnetip/readwrite/model/MResetReq.go   |  130 +-
 .../model/ProjectInstallationIdentifier.go         |  205 ++-
 .../knxnetip/readwrite/model/RelativeTimestamp.go  |  155 ++-
 .../knxnetip/readwrite/model/RoutingIndication.go  |  130 +-
 .../knxnetip/readwrite/model/SearchRequest.go      |  184 ++-
 .../knxnetip/readwrite/model/SearchResponse.go     |  292 +++--
 .../plc4go/knxnetip/readwrite/model/ServiceId.go   |  377 +++---
 .../knxnetip/readwrite/model/TDataConnectedInd.go  |  130 +-
 .../knxnetip/readwrite/model/TDataConnectedReq.go  |  130 +-
 .../knxnetip/readwrite/model/TDataIndividualInd.go |  130 +-
 .../knxnetip/readwrite/model/TDataIndividualReq.go |  130 +-
 .../knxnetip/readwrite/model/TunnelingRequest.go   |  240 ++--
 .../readwrite/model/TunnelingRequestDataBlock.go   |  289 +++--
 .../knxnetip/readwrite/model/TunnelingResponse.go  |  184 ++-
 .../readwrite/model/TunnelingResponseDataBlock.go  |  287 +++--
 .../knxnetip/readwrite/model/UnknownMessage.go     |  226 ++--
 plc4go/internal/plc4go/modbus/ModbusDriver.go      |  128 +-
 .../internal/plc4go/modbus/ModbusMessageCodec.go   |  140 +-
 .../internal/plc4go/modbus/ModbusValueHandler.go   |    4 +-
 plc4go/internal/plc4go/modbus/ModbusWriter.go      |   60 +-
 .../modbus/readwrite/model/ModbusConstants.go      |  143 ++-
 .../plc4go/modbus/readwrite/model/ModbusPDU.go     | 1331 ++++++++++----------
 .../readwrite/model/ModbusPDUDiagnosticRequest.go  |  248 ++--
 .../readwrite/model/ModbusPDUDiagnosticResponse.go |  248 ++--
 .../modbus/readwrite/model/ModbusPDUError.go       |  194 ++-
 .../model/ModbusPDUGetComEventCounterRequest.go    |  134 +-
 .../model/ModbusPDUGetComEventCounterResponse.go   |  248 ++--
 .../model/ModbusPDUGetComEventLogRequest.go        |  134 +-
 .../model/ModbusPDUGetComEventLogResponse.go       |  422 +++----
 .../ModbusPDUMaskWriteHoldingRegisterRequest.go    |  302 +++--
 .../ModbusPDUMaskWriteHoldingRegisterResponse.go   |  302 +++--
 .../readwrite/model/ModbusPDUReadCoilsRequest.go   |  248 ++--
 .../readwrite/model/ModbusPDUReadCoilsResponse.go  |  260 ++--
 .../ModbusPDUReadDeviceIdentificationRequest.go    |  134 +-
 .../ModbusPDUReadDeviceIdentificationResponse.go   |  134 +-
 .../model/ModbusPDUReadDiscreteInputsRequest.go    |  248 ++--
 .../model/ModbusPDUReadDiscreteInputsResponse.go   |  260 ++--
 .../model/ModbusPDUReadExceptionStatusRequest.go   |  134 +-
 .../model/ModbusPDUReadExceptionStatusResponse.go  |  194 ++-
 .../model/ModbusPDUReadFifoQueueRequest.go         |  194 ++-
 .../model/ModbusPDUReadFifoQueueResponse.go        |  286 +++--
 .../model/ModbusPDUReadFileRecordRequest.go        |  278 ++--
 .../model/ModbusPDUReadFileRecordRequestItem.go    |  309 +++--
 .../model/ModbusPDUReadFileRecordResponse.go       |  278 ++--
 .../model/ModbusPDUReadFileRecordResponseItem.go   |  279 ++--
 .../model/ModbusPDUReadHoldingRegistersRequest.go  |  248 ++--
 .../model/ModbusPDUReadHoldingRegistersResponse.go |  260 ++--
 .../model/ModbusPDUReadInputRegistersRequest.go    |  248 ++--
 .../model/ModbusPDUReadInputRegistersResponse.go   |  260 ++--
 ...sPDUReadWriteMultipleHoldingRegistersRequest.go |  476 ++++---
 ...PDUReadWriteMultipleHoldingRegistersResponse.go |  260 ++--
 .../model/ModbusPDUReportServerIdRequest.go        |  134 +-
 .../model/ModbusPDUReportServerIdResponse.go       |  260 ++--
 .../model/ModbusPDUWriteFileRecordRequest.go       |  278 ++--
 .../model/ModbusPDUWriteFileRecordRequestItem.go   |  379 +++---
 .../model/ModbusPDUWriteFileRecordResponse.go      |  278 ++--
 .../model/ModbusPDUWriteFileRecordResponseItem.go  |  379 +++---
 .../model/ModbusPDUWriteMultipleCoilsRequest.go    |  368 +++---
 .../model/ModbusPDUWriteMultipleCoilsResponse.go   |  248 ++--
 ...odbusPDUWriteMultipleHoldingRegistersRequest.go |  368 +++---
 ...dbusPDUWriteMultipleHoldingRegistersResponse.go |  248 ++--
 .../model/ModbusPDUWriteSingleCoilRequest.go       |  248 ++--
 .../model/ModbusPDUWriteSingleCoilResponse.go      |  248 ++--
 .../model/ModbusPDUWriteSingleRegisterRequest.go   |  248 ++--
 .../model/ModbusPDUWriteSingleRegisterResponse.go  |  248 ++--
 .../modbus/readwrite/model/ModbusSerialADU.go      |  357 +++---
 .../plc4go/modbus/readwrite/model/ModbusTcpADU.go  |  323 +++--
 .../plc4go/s7/readwrite/model/COTPPacket.go        |  589 +++++----
 .../readwrite/model/COTPPacketConnectionRequest.go |  300 +++--
 .../model/COTPPacketConnectionResponse.go          |  300 +++--
 .../plc4go/s7/readwrite/model/COTPPacketData.go    |  246 ++--
 .../readwrite/model/COTPPacketDisconnectRequest.go |  300 +++--
 .../model/COTPPacketDisconnectResponse.go          |  246 ++--
 .../s7/readwrite/model/COTPPacketTpduError.go      |  246 ++--
 .../plc4go/s7/readwrite/model/COTPParameter.go     |  375 +++---
 .../s7/readwrite/model/COTPParameterCalledTsap.go  |  190 ++-
 .../s7/readwrite/model/COTPParameterCallingTsap.go |  190 ++-
 .../s7/readwrite/model/COTPParameterChecksum.go    |  190 ++-
 ...COTPParameterDisconnectAdditionalInformation.go |  222 ++--
 .../s7/readwrite/model/COTPParameterTpduSize.go    |  190 ++-
 .../plc4go/s7/readwrite/model/S7Address.go         |  241 ++--
 .../plc4go/s7/readwrite/model/S7AddressAny.go      |  510 ++++----
 .../plc4go/s7/readwrite/model/S7Message.go         |  661 +++++-----
 .../plc4go/s7/readwrite/model/S7MessageRequest.go  |  136 +-
 .../plc4go/s7/readwrite/model/S7MessageResponse.go |  248 ++--
 .../s7/readwrite/model/S7MessageResponseData.go    |  248 ++--
 .../plc4go/s7/readwrite/model/S7MessageUserData.go |  136 +-
 .../plc4go/s7/readwrite/model/S7Parameter.go       |  379 +++---
 .../readwrite/model/S7ParameterReadVarRequest.go   |  262 ++--
 .../readwrite/model/S7ParameterReadVarResponse.go  |  192 ++-
 .../model/S7ParameterSetupCommunication.go         |  350 +++--
 .../s7/readwrite/model/S7ParameterUserData.go      |  262 ++--
 .../s7/readwrite/model/S7ParameterUserDataItem.go  |  241 ++--
 .../model/S7ParameterUserDataItemCPUFunctions.go   |  652 +++++-----
 .../readwrite/model/S7ParameterWriteVarRequest.go  |  262 ++--
 .../readwrite/model/S7ParameterWriteVarResponse.go |  192 ++-
 .../plc4go/s7/readwrite/model/S7Payload.go         |  299 +++--
 .../s7/readwrite/model/S7PayloadReadVarResponse.go |  238 ++--
 .../plc4go/s7/readwrite/model/S7PayloadUserData.go |  232 ++--
 .../s7/readwrite/model/S7PayloadUserDataItem.go    |  471 ++++---
 ...PayloadUserDataItemCpuFunctionReadSzlRequest.go |  138 +-
 ...ayloadUserDataItemCpuFunctionReadSzlResponse.go |  298 +++--
 .../s7/readwrite/model/S7PayloadWriteVarRequest.go |  238 ++--
 .../readwrite/model/S7PayloadWriteVarResponse.go   |  228 ++--
 .../plc4go/s7/readwrite/model/S7StaticHelper.go    |    2 +-
 .../s7/readwrite/model/S7VarPayloadDataItem.go     |  365 +++---
 .../s7/readwrite/model/S7VarPayloadStatusItem.go   |  155 ++-
 .../readwrite/model/S7VarRequestParameterItem.go   |  241 ++--
 .../model/S7VarRequestParameterItemAddress.go      |  218 ++--
 .../plc4go/s7/readwrite/model/SzlDataTreeItem.go   |  375 +++---
 plc4go/internal/plc4go/s7/readwrite/model/SzlId.go |  259 ++--
 .../plc4go/s7/readwrite/model/TPKTPacket.go        |  273 ++--
 plc4go/internal/plc4go/spi/Message.go              |    2 +-
 plc4go/internal/plc4go/spi/MessageCodec.go         |   23 +-
 plc4go/internal/plc4go/spi/PlcBrowser.go           |    2 +-
 plc4go/internal/plc4go/spi/PlcDiscoverer.go        |    2 +-
 plc4go/internal/plc4go/spi/PlcSubscriber.go        |    2 +-
 .../plc4go/spi/TransportInstanceExposer.go         |    2 +-
 .../plc4go/spi/model/DefaultPlcDiscoveryEvent.go   |   29 +-
 .../spi/model/DefaultPlcSubscriptionEvent.go       |  106 +-
 .../spi/model/DefaultPlcSubscriptionRequest.go     |  174 +--
 .../spi/model/DefaultPlcSubscriptionResponse.go    |    2 +-
 .../plc4go/spi/model/DefaultPlcWriteRequest.go     |    2 +-
 .../plc4go/spi/testutils/DriverTestRunner.go       |    4 +-
 .../spi/testutils/ParserSerializerTestRunner.go    |    2 +-
 plc4go/internal/plc4go/spi/testutils/TestUtils.go  |    2 +-
 plc4go/internal/plc4go/spi/transports/Transport.go |   10 +-
 plc4go/internal/plc4go/spi/utils/CastUtils.go      |   18 +-
 plc4go/internal/plc4go/spi/utils/Serializable.go   |    2 +-
 plc4go/internal/plc4go/spi/values/BOOL.go          |    4 +-
 plc4go/internal/plc4go/spi/values/BYTE.go          |    2 +-
 plc4go/internal/plc4go/spi/values/CHAR.go          |    2 +-
 plc4go/internal/plc4go/spi/values/DATE.go          |   30 +-
 plc4go/internal/plc4go/spi/values/DATE_AND_TIME.go |    4 +-
 plc4go/internal/plc4go/spi/values/DINT.go          |    4 +-
 plc4go/internal/plc4go/spi/values/DWORD.go         |    2 +-
 .../plc4go/spi/values/IEC61131ValueHandler.go      |    2 +-
 plc4go/internal/plc4go/spi/values/INT.go           |    4 +-
 plc4go/internal/plc4go/spi/values/LINT.go          |    4 +-
 plc4go/internal/plc4go/spi/values/LREAL.go         |    4 +-
 plc4go/internal/plc4go/spi/values/LTIME.go         |    4 +-
 plc4go/internal/plc4go/spi/values/LWORD.go         |    2 +-
 plc4go/internal/plc4go/spi/values/NULL.go          |    2 +-
 plc4go/internal/plc4go/spi/values/PlcBitString.go  |   92 +-
 plc4go/internal/plc4go/spi/values/PlcByteArray.go  |    4 +-
 plc4go/internal/plc4go/spi/values/PlcList.go       |    4 +-
 .../plc4go/spi/values/PlcSimpleValueAdapter.go     |    4 +-
 plc4go/internal/plc4go/spi/values/PlcStruct.go     |   28 +-
 .../internal/plc4go/spi/values/PlcValueAdapter.go  |    2 +-
 plc4go/internal/plc4go/spi/values/REAL.go          |    4 +-
 plc4go/internal/plc4go/spi/values/SINT.go          |    4 +-
 plc4go/internal/plc4go/spi/values/STRING.go        |    2 +-
 plc4go/internal/plc4go/spi/values/TIME.go          |    4 +-
 plc4go/internal/plc4go/spi/values/TIME_OF_DAY.go   |   34 +-
 plc4go/internal/plc4go/spi/values/UDINT.go         |    4 +-
 plc4go/internal/plc4go/spi/values/UINT.go          |    4 +-
 plc4go/internal/plc4go/spi/values/ULINT.go         |    4 +-
 plc4go/internal/plc4go/spi/values/USINT.go         |    4 +-
 plc4go/internal/plc4go/spi/values/WCHAR.go         |    4 +-
 plc4go/internal/plc4go/spi/values/WORD.go          |    2 +-
 plc4go/internal/plc4go/spi/values/WSTRING.go       |    4 +-
 plc4go/pkg/plc4go/driver.go                        |    8 +-
 plc4go/pkg/plc4go/driverManager.go                 |  248 ++--
 plc4go/pkg/plc4go/model/plc_browse.go              |   36 +-
 plc4go/pkg/plc4go/model/plc_discovery.go           |   24 +-
 plc4go/pkg/plc4go/model/plc_read.go                |   13 +-
 plc4go/pkg/plc4go/model/plc_subscription.go        |   48 +-
 plc4go/pkg/plc4go/model/plc_write.go               |    1 -
 377 files changed, 40299 insertions(+), 40875 deletions(-)

diff --git a/build-utils/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/build-utils/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
index 088b7cb..40d0bbc 100644
--- a/build-utils/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
+++ b/build-utils/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
@@ -793,7 +793,7 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
             imports.add("\"errors\"");
         }
 
-        imports.add("\"io\"");
+        imports.add("\"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils\"");
 
         // At least one reserved field or simple field with complex type
         if(complexTypeDefinition.getFields().stream().anyMatch(field ->
@@ -801,14 +801,14 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
             imports.add("log \"github.com/sirupsen/logrus\"");
         }
 
+        imports.add("\"io\"");
+
         // For CEIL functions: "math"
         if(complexTypeDefinition.getFields().stream().anyMatch(field ->
             FieldUtils.contains(field, "CEIL"))) {
             imports.add("\"math\"");
         }
 
-        imports.add("\"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils\"");
-
         // For Constant field: "strconv"
         if(complexTypeDefinition.getFields().stream().anyMatch(field ->
             (field instanceof ConstField))/* || complexTypeDefinition.getAllPropertyFields().stream().anyMatch(
diff --git a/plc4go/cmd/main/drivers/knxnetip_test.go b/plc4go/cmd/main/drivers/knxnetip_test.go
index 69ad2e8..c6d8912 100644
--- a/plc4go/cmd/main/drivers/knxnetip_test.go
+++ b/plc4go/cmd/main/drivers/knxnetip_test.go
@@ -22,7 +22,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip"
-	"github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports/udp"
 	"github.com/apache/plc4x/plc4go/pkg/plc4go"
 	apiModel "github.com/apache/plc4x/plc4go/pkg/plc4go/model"
@@ -75,8 +74,8 @@ func TestKnxNetIpPlc4goBrowse(t *testing.T) {
 
 			// Create a read-request to read the manufacturer and hardware ids
 			readRequestBuilder := connection.ReadRequestBuilder()
-			readRequestBuilder.AddItem("manufacturerId", result.Address+"/0/12")
-			readRequestBuilder.AddItem("hardwareType", result.Address+"/0/78")
+            readRequestBuilder.AddItem("manufacturerId", result.Address+"/0/12")
+            readRequestBuilder.AddItem("programVersion", result.Address+"/0/13")
 			readRequest, err := readRequestBuilder.Build()
 			if err != nil {
 				t.Errorf("Error creating read-request. %s", err.Error())
@@ -95,28 +94,19 @@ func TestKnxNetIpPlc4goBrowse(t *testing.T) {
 
 			// Check the response
 			readResponse := readResult.Response
-			if readResponse.GetResponseCode("manufacturerId") != apiModel.PlcResponseCode_OK {
-				t.Errorf("Got response code %d for 'manufacturerId'", readResponse.GetResponseCode("manufacturerId"))
-				t.Fail()
-				return
-			}
-			if readResponse.GetResponseCode("hardwareType") != apiModel.PlcResponseCode_OK {
-				t.Errorf("Got response code %d for 'hardwareType'", readResponse.GetResponseCode("hardwareType"))
+            if readResponse.GetResponseCode("manufacturerId") != apiModel.PlcResponseCode_OK {
+                t.Errorf("Got response code %d for 'manufacturerId'", readResponse.GetResponseCode("manufacturerId"))
+                t.Fail()
+                return
+            }if readResponse.GetResponseCode("programVersion") != apiModel.PlcResponseCode_OK {
+				t.Errorf("Got response code %d for 'hardwareType'", readResponse.GetResponseCode("programVersion"))
 				t.Fail()
 				return
 			}
 
-			// Process the results
-			manufacturerId := readResponse.GetValue("manufacturerId")
-			manufacturerName := ""
-			for manufacturer := model.KnxManufacturer_M_UNKNOWN; manufacturer <= model.KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED; manufacturer++ {
-				if manufacturer.Number() == manufacturerId.GetUint16() {
-					manufacturerName = manufacturer.Name()
-					break
-				}
-			}
-			hardwareType := readResponse.GetValue("hardwareType").GetRaw()
-			fmt.Printf(" - Manufacturer: %d: %s\n - Hardware Type: %s\n", manufacturerId.GetUint16(), manufacturerName, hex.EncodeToString(hardwareType))
+            manufacturerId := readResponse.GetValue("manufacturerId").GetUint16()
+            programVersion := readResponse.GetValue("programVersion").GetRaw()
+			fmt.Printf(" - Manufacturer Id: %d, Program Version: %s\n", manufacturerId, hex.EncodeToString(programVersion))
 		}
 	}
 }
@@ -291,7 +281,8 @@ func TestKnxNetIpPlc4goPropertyRead(t *testing.T) {
 
 	readRequestBuilder := connection.ReadRequestBuilder()
 	readRequestBuilder.AddItem("manufacturerId", "1.1.10/0/12")
-	readRequestBuilder.AddItem("hardwareType", "1.1.10/0/78")
+	readRequestBuilder.AddItem("programVersion", "1.1.10/3/13")
+	//readRequestBuilder.AddItem("hardwareType", "1.1.10/0/78")
 	readRequest, _ := readRequestBuilder.Build()
 
 	rrr := readRequest.Execute()
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
index fd8e1ab..83f1f14 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
@@ -19,274 +19,273 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
-    "reflect"
-    "strings"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
+	"reflect"
+	"strings"
 )
 
 // The data-structure of this message
 type APDU struct {
-    Child IAPDUChild
-    IAPDU
-    IAPDUParent
+	Child IAPDUChild
+	IAPDU
+	IAPDUParent
 }
 
 // The corresponding interface
 type IAPDU interface {
-    ApduType() uint8
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	ApduType() uint8
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 type IAPDUParent interface {
-    SerializeParent(io utils.WriteBuffer, child IAPDU, serializeChildFunction func() error) error
-    GetTypeName() string
+	SerializeParent(io utils.WriteBuffer, child IAPDU, serializeChildFunction func() error) error
+	GetTypeName() string
 }
 
 type IAPDUChild interface {
-    Serialize(io utils.WriteBuffer) error
-    InitializeParent(parent *APDU)
-    GetTypeName() string
-    IAPDU
+	Serialize(io utils.WriteBuffer) error
+	InitializeParent(parent *APDU)
+	GetTypeName() string
+	IAPDU
 }
 
 func NewAPDU() *APDU {
-    return &APDU{}
+	return &APDU{}
 }
 
 func CastAPDU(structType interface{}) *APDU {
-    castFunc := func(typ interface{}) *APDU {
-        if casted, ok := typ.(APDU); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return casted
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDU {
+		if casted, ok := typ.(APDU); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return casted
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDU) GetTypeName() string {
-    return "APDU"
+	return "APDU"
 }
 
 func (m *APDU) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Discriminator Field (apduType)
-    lengthInBits += 4
+	// Discriminator Field (apduType)
+	lengthInBits += 4
 
-    // Length of sub-type elements will be added by sub-type...
-    lengthInBits += m.Child.LengthInBits()
+	// Length of sub-type elements will be added by sub-type...
+	lengthInBits += m.Child.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDU) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUParse(io *utils.ReadBuffer, apduLength uint16) (*APDU, error) {
 
-    // Discriminator Field (apduType) (Used as input to a switch field)
-    apduType, _apduTypeErr := io.ReadUint8(4)
-    if _apduTypeErr != nil {
-        return nil, errors.New("Error parsing 'apduType' field " + _apduTypeErr.Error())
-    }
+	// Discriminator Field (apduType) (Used as input to a switch field)
+	apduType, _apduTypeErr := io.ReadUint8(4)
+	if _apduTypeErr != nil {
+		return nil, errors.New("Error parsing 'apduType' field " + _apduTypeErr.Error())
+	}
 
-    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
-    var _parent *APDU
-    var typeSwitchError error
-    switch {
-    case apduType == 0x0:
-        _parent, typeSwitchError = APDUConfirmedRequestParse(io, apduLength)
-    case apduType == 0x1:
-        _parent, typeSwitchError = APDUUnconfirmedRequestParse(io, apduLength)
-    case apduType == 0x2:
-        _parent, typeSwitchError = APDUSimpleAckParse(io)
-    case apduType == 0x3:
-        _parent, typeSwitchError = APDUComplexAckParse(io)
-    case apduType == 0x4:
-        _parent, typeSwitchError = APDUSegmentAckParse(io)
-    case apduType == 0x5:
-        _parent, typeSwitchError = APDUErrorParse(io)
-    case apduType == 0x6:
-        _parent, typeSwitchError = APDURejectParse(io)
-    case apduType == 0x7:
-        _parent, typeSwitchError = APDUAbortParse(io)
-    }
-    if typeSwitchError != nil {
-        return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
-    }
+	// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+	var _parent *APDU
+	var typeSwitchError error
+	switch {
+	case apduType == 0x0:
+		_parent, typeSwitchError = APDUConfirmedRequestParse(io, apduLength)
+	case apduType == 0x1:
+		_parent, typeSwitchError = APDUUnconfirmedRequestParse(io, apduLength)
+	case apduType == 0x2:
+		_parent, typeSwitchError = APDUSimpleAckParse(io)
+	case apduType == 0x3:
+		_parent, typeSwitchError = APDUComplexAckParse(io)
+	case apduType == 0x4:
+		_parent, typeSwitchError = APDUSegmentAckParse(io)
+	case apduType == 0x5:
+		_parent, typeSwitchError = APDUErrorParse(io)
+	case apduType == 0x6:
+		_parent, typeSwitchError = APDURejectParse(io)
+	case apduType == 0x7:
+		_parent, typeSwitchError = APDUAbortParse(io)
+	}
+	if typeSwitchError != nil {
+		return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
+	}
 
-    // Finish initializing
-    _parent.Child.InitializeParent(_parent)
-    return _parent, nil
+	// Finish initializing
+	_parent.Child.InitializeParent(_parent)
+	return _parent, nil
 }
 
 func (m *APDU) Serialize(io utils.WriteBuffer) error {
-    return m.Child.Serialize(io)
+	return m.Child.Serialize(io)
 }
 
 func (m *APDU) SerializeParent(io utils.WriteBuffer, child IAPDU, serializeChildFunction func() error) error {
 
-    // Discriminator Field (apduType) (Used as input to a switch field)
-    apduType := uint8(child.ApduType())
-    _apduTypeErr := io.WriteUint8(4, (apduType))
-    if _apduTypeErr != nil {
-        return errors.New("Error serializing 'apduType' field " + _apduTypeErr.Error())
-    }
+	// Discriminator Field (apduType) (Used as input to a switch field)
+	apduType := uint8(child.ApduType())
+	_apduTypeErr := io.WriteUint8(4, (apduType))
+	if _apduTypeErr != nil {
+		return errors.New("Error serializing 'apduType' field " + _apduTypeErr.Error())
+	}
 
-    // Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
-    _typeSwitchErr := serializeChildFunction()
-    if _typeSwitchErr != nil {
-        return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
-    }
+	// Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
+	_typeSwitchErr := serializeChildFunction()
+	if _typeSwitchErr != nil {
+		return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
+	}
 
-    return nil
+	return nil
 }
 
 func (m *APDU) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    for {
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            default:
-                switch start.Attr[0].Value {
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUConfirmedRequest":
-                        var dt *APDUConfirmedRequest
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUConfirmedRequest)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUUnconfirmedRequest":
-                        var dt *APDUUnconfirmedRequest
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUUnconfirmedRequest)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUSimpleAck":
-                        var dt *APDUSimpleAck
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUSimpleAck)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUComplexAck":
-                        var dt *APDUComplexAck
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUComplexAck)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUSegmentAck":
-                        var dt *APDUSegmentAck
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUSegmentAck)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUError":
-                        var dt *APDUError
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUError)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUReject":
-                        var dt *APDUReject
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUReject)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.APDUAbort":
-                        var dt *APDUAbort
-                        if m.Child != nil {
-                            dt = m.Child.(*APDUAbort)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                }
-            }
-        }
-    }
+	var token xml.Token
+	var err error
+	for {
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			default:
+				switch start.Attr[0].Value {
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUConfirmedRequest":
+					var dt *APDUConfirmedRequest
+					if m.Child != nil {
+						dt = m.Child.(*APDUConfirmedRequest)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUUnconfirmedRequest":
+					var dt *APDUUnconfirmedRequest
+					if m.Child != nil {
+						dt = m.Child.(*APDUUnconfirmedRequest)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUSimpleAck":
+					var dt *APDUSimpleAck
+					if m.Child != nil {
+						dt = m.Child.(*APDUSimpleAck)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUComplexAck":
+					var dt *APDUComplexAck
+					if m.Child != nil {
+						dt = m.Child.(*APDUComplexAck)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUSegmentAck":
+					var dt *APDUSegmentAck
+					if m.Child != nil {
+						dt = m.Child.(*APDUSegmentAck)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUError":
+					var dt *APDUError
+					if m.Child != nil {
+						dt = m.Child.(*APDUError)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUReject":
+					var dt *APDUReject
+					if m.Child != nil {
+						dt = m.Child.(*APDUReject)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.APDUAbort":
+					var dt *APDUAbort
+					if m.Child != nil {
+						dt = m.Child.(*APDUAbort)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				}
+			}
+		}
+	}
 }
 
 func (m *APDU) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    className := reflect.TypeOf(m.Child).String()
-    className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".") + 1:]
-    if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
-            {Name: xml.Name{Local: "className"}, Value: className},
-        }}); err != nil {
-        return err
-    }
-    marshaller, ok := m.Child.(xml.Marshaler)
-    if !ok {
-        return errors.New("child is not castable to Marshaler")
-    }
-    marshaller.MarshalXML(e, start)
-    if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
-        return err
-    }
-    return nil
+	className := reflect.TypeOf(m.Child).String()
+	className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".")+1:]
+	if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
+		{Name: xml.Name{Local: "className"}, Value: className},
+	}}); err != nil {
+		return err
+	}
+	marshaller, ok := m.Child.(xml.Marshaler)
+	if !ok {
+		return errors.New("child is not castable to Marshaler")
+	}
+	marshaller.MarshalXML(e, start)
+	if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
index 9498863..21e3493 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
@@ -19,228 +19,226 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUAbort struct {
-    Server bool
-    OriginalInvokeId uint8
-    AbortReason uint8
-    Parent *APDU
-    IAPDUAbort
+	Server           bool
+	OriginalInvokeId uint8
+	AbortReason      uint8
+	Parent           *APDU
+	IAPDUAbort
 }
 
 // The corresponding interface
 type IAPDUAbort interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUAbort) ApduType() uint8 {
-    return 0x7
+	return 0x7
 }
 
-
 func (m *APDUAbort) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason uint8, ) *APDU {
-    child := &APDUAbort{
-        Server: server,
-        OriginalInvokeId: originalInvokeId,
-        AbortReason: abortReason,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUAbort(server bool, originalInvokeId uint8, abortReason uint8) *APDU {
+	child := &APDUAbort{
+		Server:           server,
+		OriginalInvokeId: originalInvokeId,
+		AbortReason:      abortReason,
+		Parent:           NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUAbort(structType interface{}) *APDUAbort {
-    castFunc := func(typ interface{}) *APDUAbort {
-        if casted, ok := typ.(APDUAbort); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUAbort); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUAbort(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUAbort(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUAbort {
+		if casted, ok := typ.(APDUAbort); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUAbort); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUAbort(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUAbort(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUAbort) GetTypeName() string {
-    return "APDUAbort"
+	return "APDUAbort"
 }
 
 func (m *APDUAbort) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 3
+	// Reserved Field (reserved)
+	lengthInBits += 3
 
-    // Simple field (server)
-    lengthInBits += 1
+	// Simple field (server)
+	lengthInBits += 1
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Simple field (abortReason)
-    lengthInBits += 8
+	// Simple field (abortReason)
+	lengthInBits += 8
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUAbort) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUAbortParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(3)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0x00) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0x00),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (server)
-    server, _serverErr := io.ReadBit()
-    if _serverErr != nil {
-        return nil, errors.New("Error parsing 'server' field " + _serverErr.Error())
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (abortReason)
-    abortReason, _abortReasonErr := io.ReadUint8(8)
-    if _abortReasonErr != nil {
-        return nil, errors.New("Error parsing 'abortReason' field " + _abortReasonErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUAbort{
-        Server: server,
-        OriginalInvokeId: originalInvokeId,
-        AbortReason: abortReason,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(3)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0x00) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0x00),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (server)
+	server, _serverErr := io.ReadBit()
+	if _serverErr != nil {
+		return nil, errors.New("Error parsing 'server' field " + _serverErr.Error())
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Simple Field (abortReason)
+	abortReason, _abortReasonErr := io.ReadUint8(8)
+	if _abortReasonErr != nil {
+		return nil, errors.New("Error parsing 'abortReason' field " + _abortReasonErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUAbort{
+		Server:           server,
+		OriginalInvokeId: originalInvokeId,
+		AbortReason:      abortReason,
+		Parent:           &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUAbort) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(3, uint8(0x00))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (server)
-    server := bool(m.Server)
-    _serverErr := io.WriteBit((server))
-    if _serverErr != nil {
-        return errors.New("Error serializing 'server' field " + _serverErr.Error())
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.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))
-    if _abortReasonErr != nil {
-        return errors.New("Error serializing 'abortReason' field " + _abortReasonErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(3, uint8(0x00))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (server)
+		server := bool(m.Server)
+		_serverErr := io.WriteBit((server))
+		if _serverErr != nil {
+			return errors.New("Error serializing 'server' field " + _serverErr.Error())
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.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))
+		if _abortReasonErr != nil {
+			return errors.New("Error serializing 'abortReason' field " + _abortReasonErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUAbort) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "server":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.Server = data
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "abortReason":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.AbortReason = data
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "server":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.Server = data
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "abortReason":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.AbortReason = data
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUAbort) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.Server, xml.StartElement{Name: xml.Name{Local: "server"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.AbortReason, xml.StartElement{Name: xml.Name{Local: "abortReason"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.Server, xml.StartElement{Name: xml.Name{Local: "server"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.AbortReason, xml.StartElement{Name: xml.Name{Local: "abortReason"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
index bc3ae4c..269b122 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
@@ -19,329 +19,327 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUComplexAck struct {
-    SegmentedMessage bool
-    MoreFollows bool
-    OriginalInvokeId uint8
-    SequenceNumber *uint8
-    ProposedWindowSize *uint8
-    ServiceAck *BACnetServiceAck
-    Parent *APDU
-    IAPDUComplexAck
+	SegmentedMessage   bool
+	MoreFollows        bool
+	OriginalInvokeId   uint8
+	SequenceNumber     *uint8
+	ProposedWindowSize *uint8
+	ServiceAck         *BACnetServiceAck
+	Parent             *APDU
+	IAPDUComplexAck
 }
 
 // The corresponding interface
 type IAPDUComplexAck interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUComplexAck) ApduType() uint8 {
-    return 0x3
+	return 0x3
 }
 
-
 func (m *APDUComplexAck) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck *BACnetServiceAck, ) *APDU {
-    child := &APDUComplexAck{
-        SegmentedMessage: segmentedMessage,
-        MoreFollows: moreFollows,
-        OriginalInvokeId: originalInvokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        ServiceAck: serviceAck,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUComplexAck(segmentedMessage bool, moreFollows bool, originalInvokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceAck *BACnetServiceAck) *APDU {
+	child := &APDUComplexAck{
+		SegmentedMessage:   segmentedMessage,
+		MoreFollows:        moreFollows,
+		OriginalInvokeId:   originalInvokeId,
+		SequenceNumber:     sequenceNumber,
+		ProposedWindowSize: proposedWindowSize,
+		ServiceAck:         serviceAck,
+		Parent:             NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUComplexAck(structType interface{}) *APDUComplexAck {
-    castFunc := func(typ interface{}) *APDUComplexAck {
-        if casted, ok := typ.(APDUComplexAck); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUComplexAck); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUComplexAck(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUComplexAck(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUComplexAck {
+		if casted, ok := typ.(APDUComplexAck); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUComplexAck); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUComplexAck(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUComplexAck(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUComplexAck) GetTypeName() string {
-    return "APDUComplexAck"
+	return "APDUComplexAck"
 }
 
 func (m *APDUComplexAck) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Simple field (segmentedMessage)
-    lengthInBits += 1
+	// Simple field (segmentedMessage)
+	lengthInBits += 1
 
-    // Simple field (moreFollows)
-    lengthInBits += 1
+	// Simple field (moreFollows)
+	lengthInBits += 1
 
-    // Reserved Field (reserved)
-    lengthInBits += 2
+	// Reserved Field (reserved)
+	lengthInBits += 2
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Optional Field (sequenceNumber)
-    if m.SequenceNumber != nil {
-        lengthInBits += 8
-    }
+	// Optional Field (sequenceNumber)
+	if m.SequenceNumber != nil {
+		lengthInBits += 8
+	}
 
-    // Optional Field (proposedWindowSize)
-    if m.ProposedWindowSize != nil {
-        lengthInBits += 8
-    }
+	// Optional Field (proposedWindowSize)
+	if m.ProposedWindowSize != nil {
+		lengthInBits += 8
+	}
 
-    // Simple field (serviceAck)
-    lengthInBits += m.ServiceAck.LengthInBits()
+	// Simple field (serviceAck)
+	lengthInBits += m.ServiceAck.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUComplexAck) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUComplexAckParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Simple Field (segmentedMessage)
-    segmentedMessage, _segmentedMessageErr := io.ReadBit()
-    if _segmentedMessageErr != nil {
-        return nil, errors.New("Error parsing 'segmentedMessage' field " + _segmentedMessageErr.Error())
-    }
-
-    // Simple Field (moreFollows)
-    moreFollows, _moreFollowsErr := io.ReadBit()
-    if _moreFollowsErr != nil {
-        return nil, errors.New("Error parsing 'moreFollows' field " + _moreFollowsErr.Error())
-    }
-
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(2)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Optional Field (sequenceNumber) (Can be skipped, if a given expression evaluates to false)
-    var sequenceNumber *uint8 = nil
-    if segmentedMessage {
-        _val, _err := io.ReadUint8(8)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'sequenceNumber' field " + _err.Error())
-        }
-        sequenceNumber = &_val
-    }
-
-    // Optional Field (proposedWindowSize) (Can be skipped, if a given expression evaluates to false)
-    var proposedWindowSize *uint8 = nil
-    if segmentedMessage {
-        _val, _err := io.ReadUint8(8)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'proposedWindowSize' field " + _err.Error())
-        }
-        proposedWindowSize = &_val
-    }
-
-    // Simple Field (serviceAck)
-    serviceAck, _serviceAckErr := BACnetServiceAckParse(io)
-    if _serviceAckErr != nil {
-        return nil, errors.New("Error parsing 'serviceAck' field " + _serviceAckErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUComplexAck{
-        SegmentedMessage: segmentedMessage,
-        MoreFollows: moreFollows,
-        OriginalInvokeId: originalInvokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        ServiceAck: serviceAck,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Simple Field (segmentedMessage)
+	segmentedMessage, _segmentedMessageErr := io.ReadBit()
+	if _segmentedMessageErr != nil {
+		return nil, errors.New("Error parsing 'segmentedMessage' field " + _segmentedMessageErr.Error())
+	}
+
+	// Simple Field (moreFollows)
+	moreFollows, _moreFollowsErr := io.ReadBit()
+	if _moreFollowsErr != nil {
+		return nil, errors.New("Error parsing 'moreFollows' field " + _moreFollowsErr.Error())
+	}
+
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(2)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Optional Field (sequenceNumber) (Can be skipped, if a given expression evaluates to false)
+	var sequenceNumber *uint8 = nil
+	if segmentedMessage {
+		_val, _err := io.ReadUint8(8)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'sequenceNumber' field " + _err.Error())
+		}
+		sequenceNumber = &_val
+	}
+
+	// Optional Field (proposedWindowSize) (Can be skipped, if a given expression evaluates to false)
+	var proposedWindowSize *uint8 = nil
+	if segmentedMessage {
+		_val, _err := io.ReadUint8(8)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'proposedWindowSize' field " + _err.Error())
+		}
+		proposedWindowSize = &_val
+	}
+
+	// Simple Field (serviceAck)
+	serviceAck, _serviceAckErr := BACnetServiceAckParse(io)
+	if _serviceAckErr != nil {
+		return nil, errors.New("Error parsing 'serviceAck' field " + _serviceAckErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUComplexAck{
+		SegmentedMessage:   segmentedMessage,
+		MoreFollows:        moreFollows,
+		OriginalInvokeId:   originalInvokeId,
+		SequenceNumber:     sequenceNumber,
+		ProposedWindowSize: proposedWindowSize,
+		ServiceAck:         serviceAck,
+		Parent:             &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUComplexAck) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Simple Field (segmentedMessage)
-    segmentedMessage := bool(m.SegmentedMessage)
-    _segmentedMessageErr := io.WriteBit((segmentedMessage))
-    if _segmentedMessageErr != nil {
-        return errors.New("Error serializing 'segmentedMessage' field " + _segmentedMessageErr.Error())
-    }
-
-    // Simple Field (moreFollows)
-    moreFollows := bool(m.MoreFollows)
-    _moreFollowsErr := io.WriteBit((moreFollows))
-    if _moreFollowsErr != nil {
-        return errors.New("Error serializing 'moreFollows' field " + _moreFollowsErr.Error())
-    }
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(2, uint8(0))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.OriginalInvokeId)
-    _originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
-    if _originalInvokeIdErr != nil {
-        return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Optional Field (sequenceNumber) (Can be skipped, if the value is null)
-    var sequenceNumber *uint8 = nil
-    if m.SequenceNumber != nil {
-        sequenceNumber = m.SequenceNumber
-        _sequenceNumberErr := io.WriteUint8(8, *(sequenceNumber))
-        if _sequenceNumberErr != nil {
-            return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
-        }
-    }
-
-    // Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
-    var proposedWindowSize *uint8 = nil
-    if m.ProposedWindowSize != nil {
-        proposedWindowSize = m.ProposedWindowSize
-        _proposedWindowSizeErr := io.WriteUint8(8, *(proposedWindowSize))
-        if _proposedWindowSizeErr != nil {
-            return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
-        }
-    }
-
-    // Simple Field (serviceAck)
-    _serviceAckErr := m.ServiceAck.Serialize(io)
-    if _serviceAckErr != nil {
-        return errors.New("Error serializing 'serviceAck' field " + _serviceAckErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Simple Field (segmentedMessage)
+		segmentedMessage := bool(m.SegmentedMessage)
+		_segmentedMessageErr := io.WriteBit((segmentedMessage))
+		if _segmentedMessageErr != nil {
+			return errors.New("Error serializing 'segmentedMessage' field " + _segmentedMessageErr.Error())
+		}
+
+		// Simple Field (moreFollows)
+		moreFollows := bool(m.MoreFollows)
+		_moreFollowsErr := io.WriteBit((moreFollows))
+		if _moreFollowsErr != nil {
+			return errors.New("Error serializing 'moreFollows' field " + _moreFollowsErr.Error())
+		}
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(2, uint8(0))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.OriginalInvokeId)
+		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		if _originalInvokeIdErr != nil {
+			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+		}
+
+		// Optional Field (sequenceNumber) (Can be skipped, if the value is null)
+		var sequenceNumber *uint8 = nil
+		if m.SequenceNumber != nil {
+			sequenceNumber = m.SequenceNumber
+			_sequenceNumberErr := io.WriteUint8(8, *(sequenceNumber))
+			if _sequenceNumberErr != nil {
+				return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
+			}
+		}
+
+		// Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
+		var proposedWindowSize *uint8 = nil
+		if m.ProposedWindowSize != nil {
+			proposedWindowSize = m.ProposedWindowSize
+			_proposedWindowSizeErr := io.WriteUint8(8, *(proposedWindowSize))
+			if _proposedWindowSizeErr != nil {
+				return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
+			}
+		}
+
+		// Simple Field (serviceAck)
+		_serviceAckErr := m.ServiceAck.Serialize(io)
+		if _serviceAckErr != nil {
+			return errors.New("Error serializing 'serviceAck' field " + _serviceAckErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUComplexAck) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "segmentedMessage":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.SegmentedMessage = data
-            case "moreFollows":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.MoreFollows = data
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "sequenceNumber":
-                var data *uint8
-                if err := d.DecodeElement(data, &tok); err != nil {
-                    return err
-                }
-                m.SequenceNumber = data
-            case "proposedWindowSize":
-                var data *uint8
-                if err := d.DecodeElement(data, &tok); err != nil {
-                    return err
-                }
-                m.ProposedWindowSize = data
-            case "serviceAck":
-                var dt *BACnetServiceAck
-                if err := d.DecodeElement(&dt, &tok); err != nil {
-                    return err
-                }
-                m.ServiceAck = dt
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "segmentedMessage":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.SegmentedMessage = data
+			case "moreFollows":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.MoreFollows = data
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "sequenceNumber":
+				var data *uint8
+				if err := d.DecodeElement(data, &tok); err != nil {
+					return err
+				}
+				m.SequenceNumber = data
+			case "proposedWindowSize":
+				var data *uint8
+				if err := d.DecodeElement(data, &tok); err != nil {
+					return err
+				}
+				m.ProposedWindowSize = data
+			case "serviceAck":
+				var dt *BACnetServiceAck
+				if err := d.DecodeElement(&dt, &tok); err != nil {
+					return err
+				}
+				m.ServiceAck = dt
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUComplexAck) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.SegmentedMessage, xml.StartElement{Name: xml.Name{Local: "segmentedMessage"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.MoreFollows, xml.StartElement{Name: xml.Name{Local: "moreFollows"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ServiceAck, xml.StartElement{Name: xml.Name{Local: "serviceAck"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.SegmentedMessage, xml.StartElement{Name: xml.Name{Local: "segmentedMessage"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.MoreFollows, xml.StartElement{Name: xml.Name{Local: "moreFollows"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ServiceAck, xml.StartElement{Name: xml.Name{Local: "serviceAck"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index c510951..482a179 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -19,413 +19,411 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUConfirmedRequest struct {
-    SegmentedMessage bool
-    MoreFollows bool
-    SegmentedResponseAccepted bool
-    MaxSegmentsAccepted uint8
-    MaxApduLengthAccepted uint8
-    InvokeId uint8
-    SequenceNumber *uint8
-    ProposedWindowSize *uint8
-    ServiceRequest *BACnetConfirmedServiceRequest
-    Parent *APDU
-    IAPDUConfirmedRequest
+	SegmentedMessage          bool
+	MoreFollows               bool
+	SegmentedResponseAccepted bool
+	MaxSegmentsAccepted       uint8
+	MaxApduLengthAccepted     uint8
+	InvokeId                  uint8
+	SequenceNumber            *uint8
+	ProposedWindowSize        *uint8
+	ServiceRequest            *BACnetConfirmedServiceRequest
+	Parent                    *APDU
+	IAPDUConfirmedRequest
 }
 
 // The corresponding interface
 type IAPDUConfirmedRequest interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUConfirmedRequest) ApduType() uint8 {
-    return 0x0
+	return 0x0
 }
 
-
 func (m *APDUConfirmedRequest) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted uint8, maxApduLengthAccepted uint8, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest *BACnetConfirmedServiceRequest, ) *APDU {
-    child := &APDUConfirmedRequest{
-        SegmentedMessage: segmentedMessage,
-        MoreFollows: moreFollows,
-        SegmentedResponseAccepted: segmentedResponseAccepted,
-        MaxSegmentsAccepted: maxSegmentsAccepted,
-        MaxApduLengthAccepted: maxApduLengthAccepted,
-        InvokeId: invokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        ServiceRequest: serviceRequest,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUConfirmedRequest(segmentedMessage bool, moreFollows bool, segmentedResponseAccepted bool, maxSegmentsAccepted uint8, maxApduLengthAccepted uint8, invokeId uint8, sequenceNumber *uint8, proposedWindowSize *uint8, serviceRequest *BACnetConfirmedServiceRequest) *APDU {
+	child := &APDUConfirmedRequest{
+		SegmentedMessage:          segmentedMessage,
+		MoreFollows:               moreFollows,
+		SegmentedResponseAccepted: segmentedResponseAccepted,
+		MaxSegmentsAccepted:       maxSegmentsAccepted,
+		MaxApduLengthAccepted:     maxApduLengthAccepted,
+		InvokeId:                  invokeId,
+		SequenceNumber:            sequenceNumber,
+		ProposedWindowSize:        proposedWindowSize,
+		ServiceRequest:            serviceRequest,
+		Parent:                    NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUConfirmedRequest(structType interface{}) *APDUConfirmedRequest {
-    castFunc := func(typ interface{}) *APDUConfirmedRequest {
-        if casted, ok := typ.(APDUConfirmedRequest); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUConfirmedRequest); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUConfirmedRequest(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUConfirmedRequest(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUConfirmedRequest {
+		if casted, ok := typ.(APDUConfirmedRequest); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUConfirmedRequest); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUConfirmedRequest(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUConfirmedRequest(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUConfirmedRequest) GetTypeName() string {
-    return "APDUConfirmedRequest"
+	return "APDUConfirmedRequest"
 }
 
 func (m *APDUConfirmedRequest) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Simple field (segmentedMessage)
-    lengthInBits += 1
+	// Simple field (segmentedMessage)
+	lengthInBits += 1
 
-    // Simple field (moreFollows)
-    lengthInBits += 1
+	// Simple field (moreFollows)
+	lengthInBits += 1
 
-    // Simple field (segmentedResponseAccepted)
-    lengthInBits += 1
+	// Simple field (segmentedResponseAccepted)
+	lengthInBits += 1
 
-    // Reserved Field (reserved)
-    lengthInBits += 2
+	// Reserved Field (reserved)
+	lengthInBits += 2
 
-    // Simple field (maxSegmentsAccepted)
-    lengthInBits += 3
+	// Simple field (maxSegmentsAccepted)
+	lengthInBits += 3
 
-    // Simple field (maxApduLengthAccepted)
-    lengthInBits += 4
+	// Simple field (maxApduLengthAccepted)
+	lengthInBits += 4
 
-    // Simple field (invokeId)
-    lengthInBits += 8
+	// Simple field (invokeId)
+	lengthInBits += 8
 
-    // Optional Field (sequenceNumber)
-    if m.SequenceNumber != nil {
-        lengthInBits += 8
-    }
+	// Optional Field (sequenceNumber)
+	if m.SequenceNumber != nil {
+		lengthInBits += 8
+	}
 
-    // Optional Field (proposedWindowSize)
-    if m.ProposedWindowSize != nil {
-        lengthInBits += 8
-    }
+	// Optional Field (proposedWindowSize)
+	if m.ProposedWindowSize != nil {
+		lengthInBits += 8
+	}
 
-    // Simple field (serviceRequest)
-    lengthInBits += m.ServiceRequest.LengthInBits()
+	// Simple field (serviceRequest)
+	lengthInBits += m.ServiceRequest.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUConfirmedRequest) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUConfirmedRequestParse(io *utils.ReadBuffer, apduLength uint16) (*APDU, error) {
 
-    // Simple Field (segmentedMessage)
-    segmentedMessage, _segmentedMessageErr := io.ReadBit()
-    if _segmentedMessageErr != nil {
-        return nil, errors.New("Error parsing 'segmentedMessage' field " + _segmentedMessageErr.Error())
-    }
-
-    // Simple Field (moreFollows)
-    moreFollows, _moreFollowsErr := io.ReadBit()
-    if _moreFollowsErr != nil {
-        return nil, errors.New("Error parsing 'moreFollows' field " + _moreFollowsErr.Error())
-    }
-
-    // Simple Field (segmentedResponseAccepted)
-    segmentedResponseAccepted, _segmentedResponseAcceptedErr := io.ReadBit()
-    if _segmentedResponseAcceptedErr != nil {
-        return nil, errors.New("Error parsing 'segmentedResponseAccepted' field " + _segmentedResponseAcceptedErr.Error())
-    }
-
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(2)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (maxSegmentsAccepted)
-    maxSegmentsAccepted, _maxSegmentsAcceptedErr := io.ReadUint8(3)
-    if _maxSegmentsAcceptedErr != nil {
-        return nil, errors.New("Error parsing 'maxSegmentsAccepted' field " + _maxSegmentsAcceptedErr.Error())
-    }
-
-    // Simple Field (maxApduLengthAccepted)
-    maxApduLengthAccepted, _maxApduLengthAcceptedErr := io.ReadUint8(4)
-    if _maxApduLengthAcceptedErr != nil {
-        return nil, errors.New("Error parsing 'maxApduLengthAccepted' field " + _maxApduLengthAcceptedErr.Error())
-    }
-
-    // Simple Field (invokeId)
-    invokeId, _invokeIdErr := io.ReadUint8(8)
-    if _invokeIdErr != nil {
-        return nil, errors.New("Error parsing 'invokeId' field " + _invokeIdErr.Error())
-    }
-
-    // Optional Field (sequenceNumber) (Can be skipped, if a given expression evaluates to false)
-    var sequenceNumber *uint8 = nil
-    if segmentedMessage {
-        _val, _err := io.ReadUint8(8)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'sequenceNumber' field " + _err.Error())
-        }
-        sequenceNumber = &_val
-    }
-
-    // Optional Field (proposedWindowSize) (Can be skipped, if a given expression evaluates to false)
-    var proposedWindowSize *uint8 = nil
-    if segmentedMessage {
-        _val, _err := io.ReadUint8(8)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'proposedWindowSize' field " + _err.Error())
-        }
-        proposedWindowSize = &_val
-    }
-
-    // Simple Field (serviceRequest)
-    serviceRequest, _serviceRequestErr := BACnetConfirmedServiceRequestParse(io, uint16(apduLength) - uint16(uint16(uint16(uint16(3)) + uint16(uint16(utils.InlineIf(segmentedMessage, uint16(uint16(2)), uint16(uint16(0))))))))
-    if _serviceRequestErr != nil {
-        return nil, errors.New("Error parsing 'serviceRequest' field " + _serviceRequestErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUConfirmedRequest{
-        SegmentedMessage: segmentedMessage,
-        MoreFollows: moreFollows,
-        SegmentedResponseAccepted: segmentedResponseAccepted,
-        MaxSegmentsAccepted: maxSegmentsAccepted,
-        MaxApduLengthAccepted: maxApduLengthAccepted,
-        InvokeId: invokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        ServiceRequest: serviceRequest,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Simple Field (segmentedMessage)
+	segmentedMessage, _segmentedMessageErr := io.ReadBit()
+	if _segmentedMessageErr != nil {
+		return nil, errors.New("Error parsing 'segmentedMessage' field " + _segmentedMessageErr.Error())
+	}
+
+	// Simple Field (moreFollows)
+	moreFollows, _moreFollowsErr := io.ReadBit()
+	if _moreFollowsErr != nil {
+		return nil, errors.New("Error parsing 'moreFollows' field " + _moreFollowsErr.Error())
+	}
+
+	// Simple Field (segmentedResponseAccepted)
+	segmentedResponseAccepted, _segmentedResponseAcceptedErr := io.ReadBit()
+	if _segmentedResponseAcceptedErr != nil {
+		return nil, errors.New("Error parsing 'segmentedResponseAccepted' field " + _segmentedResponseAcceptedErr.Error())
+	}
+
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(2)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (maxSegmentsAccepted)
+	maxSegmentsAccepted, _maxSegmentsAcceptedErr := io.ReadUint8(3)
+	if _maxSegmentsAcceptedErr != nil {
+		return nil, errors.New("Error parsing 'maxSegmentsAccepted' field " + _maxSegmentsAcceptedErr.Error())
+	}
+
+	// Simple Field (maxApduLengthAccepted)
+	maxApduLengthAccepted, _maxApduLengthAcceptedErr := io.ReadUint8(4)
+	if _maxApduLengthAcceptedErr != nil {
+		return nil, errors.New("Error parsing 'maxApduLengthAccepted' field " + _maxApduLengthAcceptedErr.Error())
+	}
+
+	// Simple Field (invokeId)
+	invokeId, _invokeIdErr := io.ReadUint8(8)
+	if _invokeIdErr != nil {
+		return nil, errors.New("Error parsing 'invokeId' field " + _invokeIdErr.Error())
+	}
+
+	// Optional Field (sequenceNumber) (Can be skipped, if a given expression evaluates to false)
+	var sequenceNumber *uint8 = nil
+	if segmentedMessage {
+		_val, _err := io.ReadUint8(8)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'sequenceNumber' field " + _err.Error())
+		}
+		sequenceNumber = &_val
+	}
+
+	// Optional Field (proposedWindowSize) (Can be skipped, if a given expression evaluates to false)
+	var proposedWindowSize *uint8 = nil
+	if segmentedMessage {
+		_val, _err := io.ReadUint8(8)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'proposedWindowSize' field " + _err.Error())
+		}
+		proposedWindowSize = &_val
+	}
+
+	// Simple Field (serviceRequest)
+	serviceRequest, _serviceRequestErr := BACnetConfirmedServiceRequestParse(io, uint16(apduLength)-uint16(uint16(uint16(uint16(3))+uint16(uint16(utils.InlineIf(segmentedMessage, uint16(uint16(2)), uint16(uint16(0))))))))
+	if _serviceRequestErr != nil {
+		return nil, errors.New("Error parsing 'serviceRequest' field " + _serviceRequestErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUConfirmedRequest{
+		SegmentedMessage:          segmentedMessage,
+		MoreFollows:               moreFollows,
+		SegmentedResponseAccepted: segmentedResponseAccepted,
+		MaxSegmentsAccepted:       maxSegmentsAccepted,
+		MaxApduLengthAccepted:     maxApduLengthAccepted,
+		InvokeId:                  invokeId,
+		SequenceNumber:            sequenceNumber,
+		ProposedWindowSize:        proposedWindowSize,
+		ServiceRequest:            serviceRequest,
+		Parent:                    &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUConfirmedRequest) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Simple Field (segmentedMessage)
-    segmentedMessage := bool(m.SegmentedMessage)
-    _segmentedMessageErr := io.WriteBit((segmentedMessage))
-    if _segmentedMessageErr != nil {
-        return errors.New("Error serializing 'segmentedMessage' field " + _segmentedMessageErr.Error())
-    }
-
-    // Simple Field (moreFollows)
-    moreFollows := bool(m.MoreFollows)
-    _moreFollowsErr := io.WriteBit((moreFollows))
-    if _moreFollowsErr != nil {
-        return errors.New("Error serializing 'moreFollows' field " + _moreFollowsErr.Error())
-    }
-
-    // Simple Field (segmentedResponseAccepted)
-    segmentedResponseAccepted := bool(m.SegmentedResponseAccepted)
-    _segmentedResponseAcceptedErr := io.WriteBit((segmentedResponseAccepted))
-    if _segmentedResponseAcceptedErr != nil {
-        return errors.New("Error serializing 'segmentedResponseAccepted' field " + _segmentedResponseAcceptedErr.Error())
-    }
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(2, uint8(0))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (maxSegmentsAccepted)
-    maxSegmentsAccepted := uint8(m.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))
-    if _maxApduLengthAcceptedErr != nil {
-        return errors.New("Error serializing 'maxApduLengthAccepted' field " + _maxApduLengthAcceptedErr.Error())
-    }
-
-    // Simple Field (invokeId)
-    invokeId := uint8(m.InvokeId)
-    _invokeIdErr := io.WriteUint8(8, (invokeId))
-    if _invokeIdErr != nil {
-        return errors.New("Error serializing 'invokeId' field " + _invokeIdErr.Error())
-    }
-
-    // Optional Field (sequenceNumber) (Can be skipped, if the value is null)
-    var sequenceNumber *uint8 = nil
-    if m.SequenceNumber != nil {
-        sequenceNumber = m.SequenceNumber
-        _sequenceNumberErr := io.WriteUint8(8, *(sequenceNumber))
-        if _sequenceNumberErr != nil {
-            return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
-        }
-    }
-
-    // Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
-    var proposedWindowSize *uint8 = nil
-    if m.ProposedWindowSize != nil {
-        proposedWindowSize = m.ProposedWindowSize
-        _proposedWindowSizeErr := io.WriteUint8(8, *(proposedWindowSize))
-        if _proposedWindowSizeErr != nil {
-            return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
-        }
-    }
-
-    // Simple Field (serviceRequest)
-    _serviceRequestErr := m.ServiceRequest.Serialize(io)
-    if _serviceRequestErr != nil {
-        return errors.New("Error serializing 'serviceRequest' field " + _serviceRequestErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Simple Field (segmentedMessage)
+		segmentedMessage := bool(m.SegmentedMessage)
+		_segmentedMessageErr := io.WriteBit((segmentedMessage))
+		if _segmentedMessageErr != nil {
+			return errors.New("Error serializing 'segmentedMessage' field " + _segmentedMessageErr.Error())
+		}
+
+		// Simple Field (moreFollows)
+		moreFollows := bool(m.MoreFollows)
+		_moreFollowsErr := io.WriteBit((moreFollows))
+		if _moreFollowsErr != nil {
+			return errors.New("Error serializing 'moreFollows' field " + _moreFollowsErr.Error())
+		}
+
+		// Simple Field (segmentedResponseAccepted)
+		segmentedResponseAccepted := bool(m.SegmentedResponseAccepted)
+		_segmentedResponseAcceptedErr := io.WriteBit((segmentedResponseAccepted))
+		if _segmentedResponseAcceptedErr != nil {
+			return errors.New("Error serializing 'segmentedResponseAccepted' field " + _segmentedResponseAcceptedErr.Error())
+		}
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(2, uint8(0))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (maxSegmentsAccepted)
+		maxSegmentsAccepted := uint8(m.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))
+		if _maxApduLengthAcceptedErr != nil {
+			return errors.New("Error serializing 'maxApduLengthAccepted' field " + _maxApduLengthAcceptedErr.Error())
+		}
+
+		// Simple Field (invokeId)
+		invokeId := uint8(m.InvokeId)
+		_invokeIdErr := io.WriteUint8(8, (invokeId))
+		if _invokeIdErr != nil {
+			return errors.New("Error serializing 'invokeId' field " + _invokeIdErr.Error())
+		}
+
+		// Optional Field (sequenceNumber) (Can be skipped, if the value is null)
+		var sequenceNumber *uint8 = nil
+		if m.SequenceNumber != nil {
+			sequenceNumber = m.SequenceNumber
+			_sequenceNumberErr := io.WriteUint8(8, *(sequenceNumber))
+			if _sequenceNumberErr != nil {
+				return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
+			}
+		}
+
+		// Optional Field (proposedWindowSize) (Can be skipped, if the value is null)
+		var proposedWindowSize *uint8 = nil
+		if m.ProposedWindowSize != nil {
+			proposedWindowSize = m.ProposedWindowSize
+			_proposedWindowSizeErr := io.WriteUint8(8, *(proposedWindowSize))
+			if _proposedWindowSizeErr != nil {
+				return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
+			}
+		}
+
+		// Simple Field (serviceRequest)
+		_serviceRequestErr := m.ServiceRequest.Serialize(io)
+		if _serviceRequestErr != nil {
+			return errors.New("Error serializing 'serviceRequest' field " + _serviceRequestErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUConfirmedRequest) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "segmentedMessage":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.SegmentedMessage = data
-            case "moreFollows":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.MoreFollows = data
-            case "segmentedResponseAccepted":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.SegmentedResponseAccepted = data
-            case "maxSegmentsAccepted":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.MaxSegmentsAccepted = data
-            case "maxApduLengthAccepted":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.MaxApduLengthAccepted = data
-            case "invokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.InvokeId = data
-            case "sequenceNumber":
-                var data *uint8
-                if err := d.DecodeElement(data, &tok); err != nil {
-                    return err
-                }
-                m.SequenceNumber = data
-            case "proposedWindowSize":
-                var data *uint8
-                if err := d.DecodeElement(data, &tok); err != nil {
-                    return err
-                }
-                m.ProposedWindowSize = data
-            case "serviceRequest":
-                var dt *BACnetConfirmedServiceRequest
-                if err := d.DecodeElement(&dt, &tok); err != nil {
-                    return err
-                }
-                m.ServiceRequest = dt
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "segmentedMessage":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.SegmentedMessage = data
+			case "moreFollows":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.MoreFollows = data
+			case "segmentedResponseAccepted":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.SegmentedResponseAccepted = data
+			case "maxSegmentsAccepted":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.MaxSegmentsAccepted = data
+			case "maxApduLengthAccepted":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.MaxApduLengthAccepted = data
+			case "invokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.InvokeId = data
+			case "sequenceNumber":
+				var data *uint8
+				if err := d.DecodeElement(data, &tok); err != nil {
+					return err
+				}
+				m.SequenceNumber = data
+			case "proposedWindowSize":
+				var data *uint8
+				if err := d.DecodeElement(data, &tok); err != nil {
+					return err
+				}
+				m.ProposedWindowSize = data
+			case "serviceRequest":
+				var dt *BACnetConfirmedServiceRequest
+				if err := d.DecodeElement(&dt, &tok); err != nil {
+					return err
+				}
+				m.ServiceRequest = dt
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUConfirmedRequest) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.SegmentedMessage, xml.StartElement{Name: xml.Name{Local: "segmentedMessage"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.MoreFollows, xml.StartElement{Name: xml.Name{Local: "moreFollows"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.SegmentedResponseAccepted, xml.StartElement{Name: xml.Name{Local: "segmentedResponseAccepted"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.MaxSegmentsAccepted, xml.StartElement{Name: xml.Name{Local: "maxSegmentsAccepted"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.MaxApduLengthAccepted, xml.StartElement{Name: xml.Name{Local: "maxApduLengthAccepted"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.InvokeId, xml.StartElement{Name: xml.Name{Local: "invokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ServiceRequest, xml.StartElement{Name: xml.Name{Local: "serviceRequest"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.SegmentedMessage, xml.StartElement{Name: xml.Name{Local: "segmentedMessage"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.MoreFollows, xml.StartElement{Name: xml.Name{Local: "moreFollows"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.SegmentedResponseAccepted, xml.StartElement{Name: xml.Name{Local: "segmentedResponseAccepted"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.MaxSegmentsAccepted, xml.StartElement{Name: xml.Name{Local: "maxSegmentsAccepted"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.MaxApduLengthAccepted, xml.StartElement{Name: xml.Name{Local: "maxApduLengthAccepted"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.InvokeId, xml.StartElement{Name: xml.Name{Local: "invokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ServiceRequest, xml.StartElement{Name: xml.Name{Local: "serviceRequest"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
index d8ee62a..c0694e5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
@@ -19,199 +19,197 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUError struct {
-    OriginalInvokeId uint8
-    Error *BACnetError
-    Parent *APDU
-    IAPDUError
+	OriginalInvokeId uint8
+	Error            *BACnetError
+	Parent           *APDU
+	IAPDUError
 }
 
 // The corresponding interface
 type IAPDUError interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUError) ApduType() uint8 {
-    return 0x5
+	return 0x5
 }
 
-
 func (m *APDUError) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUError(originalInvokeId uint8, error *BACnetError, ) *APDU {
-    child := &APDUError{
-        OriginalInvokeId: originalInvokeId,
-        Error: error,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUError(originalInvokeId uint8, error *BACnetError) *APDU {
+	child := &APDUError{
+		OriginalInvokeId: originalInvokeId,
+		Error:            error,
+		Parent:           NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUError(structType interface{}) *APDUError {
-    castFunc := func(typ interface{}) *APDUError {
-        if casted, ok := typ.(APDUError); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUError); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUError(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUError(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUError {
+		if casted, ok := typ.(APDUError); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUError); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUError(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUError(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUError) GetTypeName() string {
-    return "APDUError"
+	return "APDUError"
 }
 
 func (m *APDUError) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 4
+	// Reserved Field (reserved)
+	lengthInBits += 4
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Simple field (error)
-    lengthInBits += m.Error.LengthInBits()
+	// Simple field (error)
+	lengthInBits += m.Error.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUError) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUErrorParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(4)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0x00) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0x00),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (error)
-    error, _errorErr := BACnetErrorParse(io)
-    if _errorErr != nil {
-        return nil, errors.New("Error parsing 'error' field " + _errorErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUError{
-        OriginalInvokeId: originalInvokeId,
-        Error: error,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(4)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0x00) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0x00),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Simple Field (error)
+	error, _errorErr := BACnetErrorParse(io)
+	if _errorErr != nil {
+		return nil, errors.New("Error parsing 'error' field " + _errorErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUError{
+		OriginalInvokeId: originalInvokeId,
+		Error:            error,
+		Parent:           &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUError) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(4, uint8(0x00))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.OriginalInvokeId)
-    _originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
-    if _originalInvokeIdErr != nil {
-        return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (error)
-    _errorErr := m.Error.Serialize(io)
-    if _errorErr != nil {
-        return errors.New("Error serializing 'error' field " + _errorErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(4, uint8(0x00))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.OriginalInvokeId)
+		_originalInvokeIdErr := io.WriteUint8(8, (originalInvokeId))
+		if _originalInvokeIdErr != nil {
+			return errors.New("Error serializing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+		}
+
+		// Simple Field (error)
+		_errorErr := m.Error.Serialize(io)
+		if _errorErr != nil {
+			return errors.New("Error serializing 'error' field " + _errorErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUError) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "error":
-                var dt *BACnetError
-                if err := d.DecodeElement(&dt, &tok); err != nil {
-                    return err
-                }
-                m.Error = dt
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "error":
+				var dt *BACnetError
+				if err := d.DecodeElement(&dt, &tok); err != nil {
+					return err
+				}
+				m.Error = dt
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUError) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.Error, xml.StartElement{Name: xml.Name{Local: "error"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.Error, xml.StartElement{Name: xml.Name{Local: "error"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
index 6e25cf1..ecb1d3c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
@@ -19,200 +19,198 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUReject struct {
-    OriginalInvokeId uint8
-    RejectReason uint8
-    Parent *APDU
-    IAPDUReject
+	OriginalInvokeId uint8
+	RejectReason     uint8
+	Parent           *APDU
+	IAPDUReject
 }
 
 // The corresponding interface
 type IAPDUReject interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUReject) ApduType() uint8 {
-    return 0x6
+	return 0x6
 }
 
-
 func (m *APDUReject) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUReject(originalInvokeId uint8, rejectReason uint8, ) *APDU {
-    child := &APDUReject{
-        OriginalInvokeId: originalInvokeId,
-        RejectReason: rejectReason,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUReject(originalInvokeId uint8, rejectReason uint8) *APDU {
+	child := &APDUReject{
+		OriginalInvokeId: originalInvokeId,
+		RejectReason:     rejectReason,
+		Parent:           NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUReject(structType interface{}) *APDUReject {
-    castFunc := func(typ interface{}) *APDUReject {
-        if casted, ok := typ.(APDUReject); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUReject); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUReject(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUReject(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUReject {
+		if casted, ok := typ.(APDUReject); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUReject); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUReject(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUReject(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUReject) GetTypeName() string {
-    return "APDUReject"
+	return "APDUReject"
 }
 
 func (m *APDUReject) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 4
+	// Reserved Field (reserved)
+	lengthInBits += 4
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Simple field (rejectReason)
-    lengthInBits += 8
+	// Simple field (rejectReason)
+	lengthInBits += 8
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUReject) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDURejectParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(4)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0x00) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0x00),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (rejectReason)
-    rejectReason, _rejectReasonErr := io.ReadUint8(8)
-    if _rejectReasonErr != nil {
-        return nil, errors.New("Error parsing 'rejectReason' field " + _rejectReasonErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUReject{
-        OriginalInvokeId: originalInvokeId,
-        RejectReason: rejectReason,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(4)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0x00) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0x00),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Simple Field (rejectReason)
+	rejectReason, _rejectReasonErr := io.ReadUint8(8)
+	if _rejectReasonErr != nil {
+		return nil, errors.New("Error parsing 'rejectReason' field " + _rejectReasonErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUReject{
+		OriginalInvokeId: originalInvokeId,
+		RejectReason:     rejectReason,
+		Parent:           &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUReject) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(4, uint8(0x00))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.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))
-    if _rejectReasonErr != nil {
-        return errors.New("Error serializing 'rejectReason' field " + _rejectReasonErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(4, uint8(0x00))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.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))
+		if _rejectReasonErr != nil {
+			return errors.New("Error serializing 'rejectReason' field " + _rejectReasonErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUReject) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "rejectReason":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.RejectReason = data
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "rejectReason":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.RejectReason = data
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUReject) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.RejectReason, xml.StartElement{Name: xml.Name{Local: "rejectReason"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.RejectReason, xml.StartElement{Name: xml.Name{Local: "rejectReason"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
index 8f3ca84..b1a4d7d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -19,284 +19,282 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUSegmentAck struct {
-    NegativeAck bool
-    Server bool
-    OriginalInvokeId uint8
-    SequenceNumber uint8
-    ProposedWindowSize uint8
-    Parent *APDU
-    IAPDUSegmentAck
+	NegativeAck        bool
+	Server             bool
+	OriginalInvokeId   uint8
+	SequenceNumber     uint8
+	ProposedWindowSize uint8
+	Parent             *APDU
+	IAPDUSegmentAck
 }
 
 // The corresponding interface
 type IAPDUSegmentAck interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUSegmentAck) ApduType() uint8 {
-    return 0x4
+	return 0x4
 }
 
-
 func (m *APDUSegmentAck) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, proposedWindowSize uint8, ) *APDU {
-    child := &APDUSegmentAck{
-        NegativeAck: negativeAck,
-        Server: server,
-        OriginalInvokeId: originalInvokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUSegmentAck(negativeAck bool, server bool, originalInvokeId uint8, sequenceNumber uint8, proposedWindowSize uint8) *APDU {
+	child := &APDUSegmentAck{
+		NegativeAck:        negativeAck,
+		Server:             server,
+		OriginalInvokeId:   originalInvokeId,
+		SequenceNumber:     sequenceNumber,
+		ProposedWindowSize: proposedWindowSize,
+		Parent:             NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUSegmentAck(structType interface{}) *APDUSegmentAck {
-    castFunc := func(typ interface{}) *APDUSegmentAck {
-        if casted, ok := typ.(APDUSegmentAck); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUSegmentAck); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUSegmentAck(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUSegmentAck(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUSegmentAck {
+		if casted, ok := typ.(APDUSegmentAck); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUSegmentAck); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUSegmentAck(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUSegmentAck(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUSegmentAck) GetTypeName() string {
-    return "APDUSegmentAck"
+	return "APDUSegmentAck"
 }
 
 func (m *APDUSegmentAck) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 2
+	// Reserved Field (reserved)
+	lengthInBits += 2
 
-    // Simple field (negativeAck)
-    lengthInBits += 1
+	// Simple field (negativeAck)
+	lengthInBits += 1
 
-    // Simple field (server)
-    lengthInBits += 1
+	// Simple field (server)
+	lengthInBits += 1
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Simple field (sequenceNumber)
-    lengthInBits += 8
+	// Simple field (sequenceNumber)
+	lengthInBits += 8
 
-    // Simple field (proposedWindowSize)
-    lengthInBits += 8
+	// Simple field (proposedWindowSize)
+	lengthInBits += 8
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUSegmentAck) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUSegmentAckParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(2)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0x00) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0x00),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (negativeAck)
-    negativeAck, _negativeAckErr := io.ReadBit()
-    if _negativeAckErr != nil {
-        return nil, errors.New("Error parsing 'negativeAck' field " + _negativeAckErr.Error())
-    }
-
-    // Simple Field (server)
-    server, _serverErr := io.ReadBit()
-    if _serverErr != nil {
-        return nil, errors.New("Error parsing 'server' field " + _serverErr.Error())
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (sequenceNumber)
-    sequenceNumber, _sequenceNumberErr := io.ReadUint8(8)
-    if _sequenceNumberErr != nil {
-        return nil, errors.New("Error parsing 'sequenceNumber' field " + _sequenceNumberErr.Error())
-    }
-
-    // Simple Field (proposedWindowSize)
-    proposedWindowSize, _proposedWindowSizeErr := io.ReadUint8(8)
-    if _proposedWindowSizeErr != nil {
-        return nil, errors.New("Error parsing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUSegmentAck{
-        NegativeAck: negativeAck,
-        Server: server,
-        OriginalInvokeId: originalInvokeId,
-        SequenceNumber: sequenceNumber,
-        ProposedWindowSize: proposedWindowSize,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(2)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0x00) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0x00),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (negativeAck)
+	negativeAck, _negativeAckErr := io.ReadBit()
+	if _negativeAckErr != nil {
+		return nil, errors.New("Error parsing 'negativeAck' field " + _negativeAckErr.Error())
+	}
+
+	// Simple Field (server)
+	server, _serverErr := io.ReadBit()
+	if _serverErr != nil {
+		return nil, errors.New("Error parsing 'server' field " + _serverErr.Error())
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Simple Field (sequenceNumber)
+	sequenceNumber, _sequenceNumberErr := io.ReadUint8(8)
+	if _sequenceNumberErr != nil {
+		return nil, errors.New("Error parsing 'sequenceNumber' field " + _sequenceNumberErr.Error())
+	}
+
+	// Simple Field (proposedWindowSize)
+	proposedWindowSize, _proposedWindowSizeErr := io.ReadUint8(8)
+	if _proposedWindowSizeErr != nil {
+		return nil, errors.New("Error parsing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUSegmentAck{
+		NegativeAck:        negativeAck,
+		Server:             server,
+		OriginalInvokeId:   originalInvokeId,
+		SequenceNumber:     sequenceNumber,
+		ProposedWindowSize: proposedWindowSize,
+		Parent:             &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUSegmentAck) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(2, uint8(0x00))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (negativeAck)
-    negativeAck := bool(m.NegativeAck)
-    _negativeAckErr := io.WriteBit((negativeAck))
-    if _negativeAckErr != nil {
-        return errors.New("Error serializing 'negativeAck' field " + _negativeAckErr.Error())
-    }
-
-    // Simple Field (server)
-    server := bool(m.Server)
-    _serverErr := io.WriteBit((server))
-    if _serverErr != nil {
-        return errors.New("Error serializing 'server' field " + _serverErr.Error())
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.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))
-    if _sequenceNumberErr != nil {
-        return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
-    }
-
-    // Simple Field (proposedWindowSize)
-    proposedWindowSize := uint8(m.ProposedWindowSize)
-    _proposedWindowSizeErr := io.WriteUint8(8, (proposedWindowSize))
-    if _proposedWindowSizeErr != nil {
-        return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(2, uint8(0x00))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (negativeAck)
+		negativeAck := bool(m.NegativeAck)
+		_negativeAckErr := io.WriteBit((negativeAck))
+		if _negativeAckErr != nil {
+			return errors.New("Error serializing 'negativeAck' field " + _negativeAckErr.Error())
+		}
+
+		// Simple Field (server)
+		server := bool(m.Server)
+		_serverErr := io.WriteBit((server))
+		if _serverErr != nil {
+			return errors.New("Error serializing 'server' field " + _serverErr.Error())
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.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))
+		if _sequenceNumberErr != nil {
+			return errors.New("Error serializing 'sequenceNumber' field " + _sequenceNumberErr.Error())
+		}
+
+		// Simple Field (proposedWindowSize)
+		proposedWindowSize := uint8(m.ProposedWindowSize)
+		_proposedWindowSizeErr := io.WriteUint8(8, (proposedWindowSize))
+		if _proposedWindowSizeErr != nil {
+			return errors.New("Error serializing 'proposedWindowSize' field " + _proposedWindowSizeErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUSegmentAck) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "negativeAck":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.NegativeAck = data
-            case "server":
-                var data bool
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.Server = data
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "sequenceNumber":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.SequenceNumber = data
-            case "proposedWindowSize":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.ProposedWindowSize = data
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "negativeAck":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.NegativeAck = data
+			case "server":
+				var data bool
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.Server = data
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "sequenceNumber":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.SequenceNumber = data
+			case "proposedWindowSize":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.ProposedWindowSize = data
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUSegmentAck) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.NegativeAck, xml.StartElement{Name: xml.Name{Local: "negativeAck"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.Server, xml.StartElement{Name: xml.Name{Local: "server"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.NegativeAck, xml.StartElement{Name: xml.Name{Local: "negativeAck"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.Server, xml.StartElement{Name: xml.Name{Local: "server"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.SequenceNumber, xml.StartElement{Name: xml.Name{Local: "sequenceNumber"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ProposedWindowSize, xml.StartElement{Name: xml.Name{Local: "proposedWindowSize"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
index 79232be..0c82efd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -19,200 +19,198 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUSimpleAck struct {
-    OriginalInvokeId uint8
-    ServiceChoice uint8
-    Parent *APDU
-    IAPDUSimpleAck
+	OriginalInvokeId uint8
+	ServiceChoice    uint8
+	Parent           *APDU
+	IAPDUSimpleAck
 }
 
 // The corresponding interface
 type IAPDUSimpleAck interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUSimpleAck) ApduType() uint8 {
-    return 0x2
+	return 0x2
 }
 
-
 func (m *APDUSimpleAck) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice uint8, ) *APDU {
-    child := &APDUSimpleAck{
-        OriginalInvokeId: originalInvokeId,
-        ServiceChoice: serviceChoice,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUSimpleAck(originalInvokeId uint8, serviceChoice uint8) *APDU {
+	child := &APDUSimpleAck{
+		OriginalInvokeId: originalInvokeId,
+		ServiceChoice:    serviceChoice,
+		Parent:           NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUSimpleAck(structType interface{}) *APDUSimpleAck {
-    castFunc := func(typ interface{}) *APDUSimpleAck {
-        if casted, ok := typ.(APDUSimpleAck); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUSimpleAck); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUSimpleAck(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUSimpleAck(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUSimpleAck {
+		if casted, ok := typ.(APDUSimpleAck); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUSimpleAck); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUSimpleAck(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUSimpleAck(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUSimpleAck) GetTypeName() string {
-    return "APDUSimpleAck"
+	return "APDUSimpleAck"
 }
 
 func (m *APDUSimpleAck) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 4
+	// Reserved Field (reserved)
+	lengthInBits += 4
 
-    // Simple field (originalInvokeId)
-    lengthInBits += 8
+	// Simple field (originalInvokeId)
+	lengthInBits += 8
 
-    // Simple field (serviceChoice)
-    lengthInBits += 8
+	// Simple field (serviceChoice)
+	lengthInBits += 8
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUSimpleAck) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUSimpleAckParse(io *utils.ReadBuffer) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(4)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
-    if _originalInvokeIdErr != nil {
-        return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
-    }
-
-    // Simple Field (serviceChoice)
-    serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
-    if _serviceChoiceErr != nil {
-        return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUSimpleAck{
-        OriginalInvokeId: originalInvokeId,
-        ServiceChoice: serviceChoice,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(4)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (originalInvokeId)
+	originalInvokeId, _originalInvokeIdErr := io.ReadUint8(8)
+	if _originalInvokeIdErr != nil {
+		return nil, errors.New("Error parsing 'originalInvokeId' field " + _originalInvokeIdErr.Error())
+	}
+
+	// Simple Field (serviceChoice)
+	serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
+	if _serviceChoiceErr != nil {
+		return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUSimpleAck{
+		OriginalInvokeId: originalInvokeId,
+		ServiceChoice:    serviceChoice,
+		Parent:           &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUSimpleAck) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(4, uint8(0))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (originalInvokeId)
-    originalInvokeId := uint8(m.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))
-    if _serviceChoiceErr != nil {
-        return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(4, uint8(0))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (originalInvokeId)
+		originalInvokeId := uint8(m.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))
+		if _serviceChoiceErr != nil {
+			return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUSimpleAck) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "originalInvokeId":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.OriginalInvokeId = data
-            case "serviceChoice":
-                var data uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.ServiceChoice = data
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "originalInvokeId":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.OriginalInvokeId = data
+			case "serviceChoice":
+				var data uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.ServiceChoice = data
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUSimpleAck) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.ServiceChoice, xml.StartElement{Name: xml.Name{Local: "serviceChoice"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.OriginalInvokeId, xml.StartElement{Name: xml.Name{Local: "originalInvokeId"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.ServiceChoice, xml.StartElement{Name: xml.Name{Local: "serviceChoice"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 4e634e2..79fa137 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -19,171 +19,169 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    log "github.com/sirupsen/logrus"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	log "github.com/sirupsen/logrus"
+	"io"
 )
 
 // The data-structure of this message
 type APDUUnconfirmedRequest struct {
-    ServiceRequest *BACnetUnconfirmedServiceRequest
-    Parent *APDU
-    IAPDUUnconfirmedRequest
+	ServiceRequest *BACnetUnconfirmedServiceRequest
+	Parent         *APDU
+	IAPDUUnconfirmedRequest
 }
 
 // The corresponding interface
 type IAPDUUnconfirmedRequest interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *APDUUnconfirmedRequest) ApduType() uint8 {
-    return 0x1
+	return 0x1
 }
 
-
 func (m *APDUUnconfirmedRequest) InitializeParent(parent *APDU) {
 }
 
-func NewAPDUUnconfirmedRequest(serviceRequest *BACnetUnconfirmedServiceRequest, ) *APDU {
-    child := &APDUUnconfirmedRequest{
-        ServiceRequest: serviceRequest,
-        Parent: NewAPDU(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+func NewAPDUUnconfirmedRequest(serviceRequest *BACnetUnconfirmedServiceRequest) *APDU {
+	child := &APDUUnconfirmedRequest{
+		ServiceRequest: serviceRequest,
+		Parent:         NewAPDU(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastAPDUUnconfirmedRequest(structType interface{}) *APDUUnconfirmedRequest {
-    castFunc := func(typ interface{}) *APDUUnconfirmedRequest {
-        if casted, ok := typ.(APDUUnconfirmedRequest); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*APDUUnconfirmedRequest); ok {
-            return casted
-        }
-        if casted, ok := typ.(APDU); ok {
-            return CastAPDUUnconfirmedRequest(casted.Child)
-        }
-        if casted, ok := typ.(*APDU); ok {
-            return CastAPDUUnconfirmedRequest(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *APDUUnconfirmedRequest {
+		if casted, ok := typ.(APDUUnconfirmedRequest); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*APDUUnconfirmedRequest); ok {
+			return casted
+		}
+		if casted, ok := typ.(APDU); ok {
+			return CastAPDUUnconfirmedRequest(casted.Child)
+		}
+		if casted, ok := typ.(*APDU); ok {
+			return CastAPDUUnconfirmedRequest(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *APDUUnconfirmedRequest) GetTypeName() string {
-    return "APDUUnconfirmedRequest"
+	return "APDUUnconfirmedRequest"
 }
 
 func (m *APDUUnconfirmedRequest) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Reserved Field (reserved)
-    lengthInBits += 4
+	// Reserved Field (reserved)
+	lengthInBits += 4
 
-    // Simple field (serviceRequest)
-    lengthInBits += m.ServiceRequest.LengthInBits()
+	// Simple field (serviceRequest)
+	lengthInBits += m.ServiceRequest.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *APDUUnconfirmedRequest) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func APDUUnconfirmedRequestParse(io *utils.ReadBuffer, apduLength uint16) (*APDU, error) {
 
-    // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
-    {
-        reserved, _err := io.ReadUint8(4)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
-        }
-        if reserved != uint8(0) {
-            log.WithFields(log.Fields{
-                "expected value": uint8(0),
-                "got value": reserved,
-            }).Info("Got unexpected response.")
-        }
-    }
-
-    // Simple Field (serviceRequest)
-    serviceRequest, _serviceRequestErr := BACnetUnconfirmedServiceRequestParse(io, uint16(apduLength) - uint16(uint16(1)))
-    if _serviceRequestErr != nil {
-        return nil, errors.New("Error parsing 'serviceRequest' field " + _serviceRequestErr.Error())
-    }
-
-    // Create a partially initialized instance
-    _child := &APDUUnconfirmedRequest{
-        ServiceRequest: serviceRequest,
-        Parent: &APDU{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+	{
+		reserved, _err := io.ReadUint8(4)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'reserved' field " + _err.Error())
+		}
+		if reserved != uint8(0) {
+			log.WithFields(log.Fields{
+				"expected value": uint8(0),
+				"got value":      reserved,
+			}).Info("Got unexpected response.")
+		}
+	}
+
+	// Simple Field (serviceRequest)
+	serviceRequest, _serviceRequestErr := BACnetUnconfirmedServiceRequestParse(io, uint16(apduLength)-uint16(uint16(1)))
+	if _serviceRequestErr != nil {
+		return nil, errors.New("Error parsing 'serviceRequest' field " + _serviceRequestErr.Error())
+	}
+
+	// Create a partially initialized instance
+	_child := &APDUUnconfirmedRequest{
+		ServiceRequest: serviceRequest,
+		Parent:         &APDU{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *APDUUnconfirmedRequest) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
-
-    // Reserved Field (reserved)
-    {
-        _err := io.WriteUint8(4, uint8(0))
-        if _err != nil {
-            return errors.New("Error serializing 'reserved' field " + _err.Error())
-        }
-    }
-
-    // Simple Field (serviceRequest)
-    _serviceRequestErr := m.ServiceRequest.Serialize(io)
-    if _serviceRequestErr != nil {
-        return errors.New("Error serializing 'serviceRequest' field " + _serviceRequestErr.Error())
-    }
-
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+	ser := func() error {
+
+		// Reserved Field (reserved)
+		{
+			_err := io.WriteUint8(4, uint8(0))
+			if _err != nil {
+				return errors.New("Error serializing 'reserved' field " + _err.Error())
+			}
+		}
+
+		// Simple Field (serviceRequest)
+		_serviceRequestErr := m.ServiceRequest.Serialize(io)
+		if _serviceRequestErr != nil {
+			return errors.New("Error serializing 'serviceRequest' field " + _serviceRequestErr.Error())
+		}
+
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *APDUUnconfirmedRequest) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "serviceRequest":
-                var dt *BACnetUnconfirmedServiceRequest
-                if err := d.DecodeElement(&dt, &tok); err != nil {
-                    return err
-                }
-                m.ServiceRequest = dt
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "serviceRequest":
+				var dt *BACnetUnconfirmedServiceRequest
+				if err := d.DecodeElement(&dt, &tok); err != nil {
+					return err
+				}
+				m.ServiceRequest = dt
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *APDUUnconfirmedRequest) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    if err := e.EncodeElement(m.ServiceRequest, xml.StartElement{Name: xml.Name{Local: "serviceRequest"}}); err != nil {
-        return err
-    }
-    return nil
+	if err := e.EncodeElement(m.ServiceRequest, xml.StartElement{Name: xml.Name{Local: "serviceRequest"}}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
index 87f35a9..e7675d0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
@@ -19,165 +19,164 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetAddress struct {
-    Address []uint8
-    Port uint16
-    IBACnetAddress
+	Address []uint8
+	Port    uint16
+	IBACnetAddress
 }
 
 // The corresponding interface
 type IBACnetAddress interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 func NewBACnetAddress(address []uint8, port uint16) *BACnetAddress {
-    return &BACnetAddress{Address: address, Port: port}
+	return &BACnetAddress{Address: address, Port: port}
 }
 
 func CastBACnetAddress(structType interface{}) *BACnetAddress {
-    castFunc := func(typ interface{}) *BACnetAddress {
-        if casted, ok := typ.(BACnetAddress); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetAddress); ok {
-            return casted
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetAddress {
+		if casted, ok := typ.(BACnetAddress); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetAddress); ok {
+			return casted
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetAddress) GetTypeName() string {
-    return "BACnetAddress"
+	return "BACnetAddress"
 }
 
 func (m *BACnetAddress) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Array field
-    if len(m.Address) > 0 {
-        lengthInBits += 8 * uint16(len(m.Address))
-    }
+	// Array field
+	if len(m.Address) > 0 {
+		lengthInBits += 8 * uint16(len(m.Address))
+	}
 
-    // Simple field (port)
-    lengthInBits += 16
+	// Simple field (port)
+	lengthInBits += 16
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetAddress) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetAddressParse(io *utils.ReadBuffer) (*BACnetAddress, error) {
 
-    // Array field (address)
-    // Count array
-    address := make([]uint8, uint16(4))
-    for curItem := uint16(0); curItem < uint16(uint16(4)); curItem++ {
-        _item, _err := io.ReadUint8(8)
-        if _err != nil {
-            return nil, errors.New("Error parsing 'address' field " + _err.Error())
-        }
-        address[curItem] = _item
-    }
-
-    // Simple Field (port)
-    port, _portErr := io.ReadUint16(16)
-    if _portErr != nil {
-        return nil, errors.New("Error parsing 'port' field " + _portErr.Error())
-    }
-
-    // Create the instance
-    return NewBACnetAddress(address, port), nil
+	// Array field (address)
+	// Count array
+	address := make([]uint8, uint16(4))
+	for curItem := uint16(0); curItem < uint16(uint16(4)); curItem++ {
+		_item, _err := io.ReadUint8(8)
+		if _err != nil {
+			return nil, errors.New("Error parsing 'address' field " + _err.Error())
+		}
+		address[curItem] = _item
+	}
+
+	// Simple Field (port)
+	port, _portErr := io.ReadUint16(16)
+	if _portErr != nil {
+		return nil, errors.New("Error parsing 'port' field " + _portErr.Error())
+	}
+
+	// Create the instance
+	return NewBACnetAddress(address, port), nil
 }
 
 func (m *BACnetAddress) Serialize(io utils.WriteBuffer) error {
 
-    // Array Field (address)
-    if m.Address != nil {
-        for _, _element := range m.Address {
-            _elementErr := io.WriteUint8(8, _element)
-            if _elementErr != nil {
-                return errors.New("Error serializing 'address' field " + _elementErr.Error())
-            }
-        }
-    }
-
-    // Simple Field (port)
-    port := uint16(m.Port)
-    _portErr := io.WriteUint16(16, (port))
-    if _portErr != nil {
-        return errors.New("Error serializing 'port' field " + _portErr.Error())
-    }
-
-    return nil
+	// Array Field (address)
+	if m.Address != nil {
+		for _, _element := range m.Address {
+			_elementErr := io.WriteUint8(8, _element)
+			if _elementErr != nil {
+				return errors.New("Error serializing 'address' field " + _elementErr.Error())
+			}
+		}
+	}
+
+	// Simple Field (port)
+	port := uint16(m.Port)
+	_portErr := io.WriteUint16(16, (port))
+	if _portErr != nil {
+		return errors.New("Error serializing 'port' field " + _portErr.Error())
+	}
+
+	return nil
 }
 
 func (m *BACnetAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    for {
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            case "address":
-                var data []uint8
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.Address = data
-            case "port":
-                var data uint16
-                if err := d.DecodeElement(&data, &tok); err != nil {
-                    return err
-                }
-                m.Port = data
-            }
-        }
-    }
+	var token xml.Token
+	var err error
+	for {
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			case "address":
+				var data []uint8
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.Address = data
+			case "port":
+				var data uint16
+				if err := d.DecodeElement(&data, &tok); err != nil {
+					return err
+				}
+				m.Port = data
+			}
+		}
+	}
 }
 
 func (m *BACnetAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    className := "org.apache.plc4x.java.bacnetip.readwrite.BACnetAddress"
-    if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
-            {Name: xml.Name{Local: "className"}, Value: className},
-        }}); err != nil {
-        return err
-    }
-    if err := e.EncodeToken(xml.StartElement{Name: xml.Name{Local: "address"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.Address, xml.StartElement{Name: xml.Name{Local: "address"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeToken(xml.EndElement{Name: xml.Name{Local: "address"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeElement(m.Port, xml.StartElement{Name: xml.Name{Local: "port"}}); err != nil {
-        return err
-    }
-    if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
-        return err
-    }
-    return nil
+	className := "org.apache.plc4x.java.bacnetip.readwrite.BACnetAddress"
+	if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
+		{Name: xml.Name{Local: "className"}, Value: className},
+	}}); err != nil {
+		return err
+	}
+	if err := e.EncodeToken(xml.StartElement{Name: xml.Name{Local: "address"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.Address, xml.StartElement{Name: xml.Name{Local: "address"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeToken(xml.EndElement{Name: xml.Name{Local: "address"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeElement(m.Port, xml.StartElement{Name: xml.Name{Local: "port"}}); err != nil {
+		return err
+	}
+	if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
index 29608f6..a2b4a30 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
@@ -19,358 +19,357 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
-    "reflect"
-    "strings"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
+	"reflect"
+	"strings"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACK struct {
-    Child IBACnetConfirmedServiceACKChild
-    IBACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKParent
+	Child IBACnetConfirmedServiceACKChild
+	IBACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKParent
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACK interface {
-    ServiceChoice() uint8
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	ServiceChoice() uint8
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 type IBACnetConfirmedServiceACKParent interface {
-    SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceACK, serializeChildFunction func() error) error
-    GetTypeName() string
+	SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceACK, serializeChildFunction func() error) error
+	GetTypeName() string
 }
 
 type IBACnetConfirmedServiceACKChild interface {
-    Serialize(io utils.WriteBuffer) error
-    InitializeParent(parent *BACnetConfirmedServiceACK)
-    GetTypeName() string
-    IBACnetConfirmedServiceACK
+	Serialize(io utils.WriteBuffer) error
+	InitializeParent(parent *BACnetConfirmedServiceACK)
+	GetTypeName() string
+	IBACnetConfirmedServiceACK
 }
 
 func NewBACnetConfirmedServiceACK() *BACnetConfirmedServiceACK {
-    return &BACnetConfirmedServiceACK{}
+	return &BACnetConfirmedServiceACK{}
 }
 
 func CastBACnetConfirmedServiceACK(structType interface{}) *BACnetConfirmedServiceACK {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACK {
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return casted
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACK {
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return casted
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACK) GetTypeName() string {
-    return "BACnetConfirmedServiceACK"
+	return "BACnetConfirmedServiceACK"
 }
 
 func (m *BACnetConfirmedServiceACK) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Discriminator Field (serviceChoice)
-    lengthInBits += 8
+	// Discriminator Field (serviceChoice)
+	lengthInBits += 8
 
-    // Length of sub-type elements will be added by sub-type...
-    lengthInBits += m.Child.LengthInBits()
+	// Length of sub-type elements will be added by sub-type...
+	lengthInBits += m.Child.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACK) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Discriminator Field (serviceChoice) (Used as input to a switch field)
-    serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
-    if _serviceChoiceErr != nil {
-        return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
+	// Discriminator Field (serviceChoice) (Used as input to a switch field)
+	serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
+	if _serviceChoiceErr != nil {
+		return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
+	}
 
-    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
-    var _parent *BACnetConfirmedServiceACK
-    var typeSwitchError error
-    switch {
-    case serviceChoice == 0x03:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKGetAlarmSummaryParse(io)
-    case serviceChoice == 0x04:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKGetEnrollmentSummaryParse(io)
-    case serviceChoice == 0x1D:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKGetEventInformationParse(io)
-    case serviceChoice == 0x06:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKAtomicReadFileParse(io)
-    case serviceChoice == 0x07:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKAtomicWriteFileParse(io)
-    case serviceChoice == 0x0A:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKCreateObjectParse(io)
-    case serviceChoice == 0x0C:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKReadPropertyParse(io)
-    case serviceChoice == 0x0E:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKReadPropertyMultipleParse(io)
-    case serviceChoice == 0x1A:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKReadRangeParse(io)
-    case serviceChoice == 0x12:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKConfirmedPrivateTransferParse(io)
-    case serviceChoice == 0x15:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKVTOpenParse(io)
-    case serviceChoice == 0x17:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKVTDataParse(io)
-    case serviceChoice == 0x18:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKRemovedAuthenticateParse(io)
-    case serviceChoice == 0x0D:
-        _parent, typeSwitchError = BACnetConfirmedServiceACKRemovedReadPropertyConditionalParse(io)
-    }
-    if typeSwitchError != nil {
-        return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
-    }
+	// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+	var _parent *BACnetConfirmedServiceACK
+	var typeSwitchError error
+	switch {
+	case serviceChoice == 0x03:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKGetAlarmSummaryParse(io)
+	case serviceChoice == 0x04:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKGetEnrollmentSummaryParse(io)
+	case serviceChoice == 0x1D:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKGetEventInformationParse(io)
+	case serviceChoice == 0x06:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKAtomicReadFileParse(io)
+	case serviceChoice == 0x07:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKAtomicWriteFileParse(io)
+	case serviceChoice == 0x0A:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKCreateObjectParse(io)
+	case serviceChoice == 0x0C:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKReadPropertyParse(io)
+	case serviceChoice == 0x0E:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKReadPropertyMultipleParse(io)
+	case serviceChoice == 0x1A:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKReadRangeParse(io)
+	case serviceChoice == 0x12:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKConfirmedPrivateTransferParse(io)
+	case serviceChoice == 0x15:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKVTOpenParse(io)
+	case serviceChoice == 0x17:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKVTDataParse(io)
+	case serviceChoice == 0x18:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKRemovedAuthenticateParse(io)
+	case serviceChoice == 0x0D:
+		_parent, typeSwitchError = BACnetConfirmedServiceACKRemovedReadPropertyConditionalParse(io)
+	}
+	if typeSwitchError != nil {
+		return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
+	}
 
-    // Finish initializing
-    _parent.Child.InitializeParent(_parent)
-    return _parent, nil
+	// Finish initializing
+	_parent.Child.InitializeParent(_parent)
+	return _parent, nil
 }
 
 func (m *BACnetConfirmedServiceACK) Serialize(io utils.WriteBuffer) error {
-    return m.Child.Serialize(io)
+	return m.Child.Serialize(io)
 }
 
 func (m *BACnetConfirmedServiceACK) SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceACK, serializeChildFunction func() error) error {
 
-    // Discriminator Field (serviceChoice) (Used as input to a switch field)
-    serviceChoice := uint8(child.ServiceChoice())
-    _serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
-    if _serviceChoiceErr != nil {
-        return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
+	// Discriminator Field (serviceChoice) (Used as input to a switch field)
+	serviceChoice := uint8(child.ServiceChoice())
+	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	if _serviceChoiceErr != nil {
+		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
+	}
 
-    // Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
-    _typeSwitchErr := serializeChildFunction()
-    if _typeSwitchErr != nil {
-        return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
-    }
+	// Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
+	_typeSwitchErr := serializeChildFunction()
+	if _typeSwitchErr != nil {
+		return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
+	}
 
-    return nil
+	return nil
 }
 
 func (m *BACnetConfirmedServiceACK) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    for {
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            default:
-                switch start.Attr[0].Value {
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetAlarmSummary":
-                        var dt *BACnetConfirmedServiceACKGetAlarmSummary
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKGetAlarmSummary)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetEnrollmentSummary":
-                        var dt *BACnetConfirmedServiceACKGetEnrollmentSummary
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKGetEnrollmentSummary)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetEventInformation":
-                        var dt *BACnetConfirmedServiceACKGetEventInformation
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKGetEventInformation)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKAtomicReadFile":
-                        var dt *BACnetConfirmedServiceACKAtomicReadFile
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKAtomicReadFile)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKAtomicWriteFile":
-                        var dt *BACnetConfirmedServiceACKAtomicWriteFile
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKAtomicWriteFile)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKCreateObject":
-                        var dt *BACnetConfirmedServiceACKCreateObject
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKCreateObject)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadProperty":
-                        var dt *BACnetConfirmedServiceACKReadProperty
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKReadProperty)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadPropertyMultiple":
-                        var dt *BACnetConfirmedServiceACKReadPropertyMultiple
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKReadPropertyMultiple)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadRange":
-                        var dt *BACnetConfirmedServiceACKReadRange
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKReadRange)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKConfirmedPrivateTransfer":
-                        var dt *BACnetConfirmedServiceACKConfirmedPrivateTransfer
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKConfirmedPrivateTransfer)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKVTOpen":
-                        var dt *BACnetConfirmedServiceACKVTOpen
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKVTOpen)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKVTData":
-                        var dt *BACnetConfirmedServiceACKVTData
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKVTData)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKRemovedAuthenticate":
-                        var dt *BACnetConfirmedServiceACKRemovedAuthenticate
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKRemovedAuthenticate)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKRemovedReadPropertyConditional":
-                        var dt *BACnetConfirmedServiceACKRemovedReadPropertyConditional
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceACKRemovedReadPropertyConditional)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                }
-            }
-        }
-    }
+	var token xml.Token
+	var err error
+	for {
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			default:
+				switch start.Attr[0].Value {
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetAlarmSummary":
+					var dt *BACnetConfirmedServiceACKGetAlarmSummary
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKGetAlarmSummary)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetEnrollmentSummary":
+					var dt *BACnetConfirmedServiceACKGetEnrollmentSummary
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKGetEnrollmentSummary)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKGetEventInformation":
+					var dt *BACnetConfirmedServiceACKGetEventInformation
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKGetEventInformation)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKAtomicReadFile":
+					var dt *BACnetConfirmedServiceACKAtomicReadFile
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKAtomicReadFile)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKAtomicWriteFile":
+					var dt *BACnetConfirmedServiceACKAtomicWriteFile
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKAtomicWriteFile)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKCreateObject":
+					var dt *BACnetConfirmedServiceACKCreateObject
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKCreateObject)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadProperty":
+					var dt *BACnetConfirmedServiceACKReadProperty
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKReadProperty)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadPropertyMultiple":
+					var dt *BACnetConfirmedServiceACKReadPropertyMultiple
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKReadPropertyMultiple)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKReadRange":
+					var dt *BACnetConfirmedServiceACKReadRange
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKReadRange)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKConfirmedPrivateTransfer":
+					var dt *BACnetConfirmedServiceACKConfirmedPrivateTransfer
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKConfirmedPrivateTransfer)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKVTOpen":
+					var dt *BACnetConfirmedServiceACKVTOpen
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKVTOpen)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKVTData":
+					var dt *BACnetConfirmedServiceACKVTData
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKVTData)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKRemovedAuthenticate":
+					var dt *BACnetConfirmedServiceACKRemovedAuthenticate
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKRemovedAuthenticate)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceACKRemovedReadPropertyConditional":
+					var dt *BACnetConfirmedServiceACKRemovedReadPropertyConditional
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceACKRemovedReadPropertyConditional)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				}
+			}
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACK) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    className := reflect.TypeOf(m.Child).String()
-    className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".") + 1:]
-    if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
-            {Name: xml.Name{Local: "className"}, Value: className},
-        }}); err != nil {
-        return err
-    }
-    marshaller, ok := m.Child.(xml.Marshaler)
-    if !ok {
-        return errors.New("child is not castable to Marshaler")
-    }
-    marshaller.MarshalXML(e, start)
-    if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
-        return err
-    }
-    return nil
+	className := reflect.TypeOf(m.Child).String()
+	className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".")+1:]
+	if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
+		{Name: xml.Name{Local: "className"}, Value: className},
+	}}); err != nil {
+		return err
+	}
+	marshaller, ok := m.Child.(xml.Marshaler)
+	if !ok {
+		return errors.New("child is not castable to Marshaler")
+	}
+	marshaller.MarshalXML(e, start)
+	if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
index 48d0a3b..b7b6374 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKAtomicReadFile struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKAtomicReadFile
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKAtomicReadFile
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKAtomicReadFile interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKAtomicReadFile) ServiceChoice() uint8 {
-    return 0x06
+	return 0x06
 }
 
-
 func (m *BACnetConfirmedServiceACKAtomicReadFile) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKAtomicReadFile() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKAtomicReadFile{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKAtomicReadFile{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKAtomicReadFile(structType interface{}) *BACnetConfirmedServiceACKAtomicReadFile {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKAtomicReadFile {
-        if casted, ok := typ.(BACnetConfirmedServiceACKAtomicReadFile); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKAtomicReadFile); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKAtomicReadFile(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKAtomicReadFile(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKAtomicReadFile {
+		if casted, ok := typ.(BACnetConfirmedServiceACKAtomicReadFile); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKAtomicReadFile); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKAtomicReadFile(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKAtomicReadFile(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) GetTypeName() string {
-    return "BACnetConfirmedServiceACKAtomicReadFile"
+	return "BACnetConfirmedServiceACKAtomicReadFile"
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKAtomicReadFileParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKAtomicReadFile{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKAtomicReadFile{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKAtomicReadFile) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
index 162df47..65bcb73 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKAtomicWriteFile struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKAtomicWriteFile
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKAtomicWriteFile
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKAtomicWriteFile interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) ServiceChoice() uint8 {
-    return 0x07
+	return 0x07
 }
 
-
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKAtomicWriteFile() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKAtomicWriteFile{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKAtomicWriteFile{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKAtomicWriteFile(structType interface{}) *BACnetConfirmedServiceACKAtomicWriteFile {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKAtomicWriteFile {
-        if casted, ok := typ.(BACnetConfirmedServiceACKAtomicWriteFile); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKAtomicWriteFile); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKAtomicWriteFile(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKAtomicWriteFile(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKAtomicWriteFile {
+		if casted, ok := typ.(BACnetConfirmedServiceACKAtomicWriteFile); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKAtomicWriteFile); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKAtomicWriteFile(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKAtomicWriteFile(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetTypeName() string {
-    return "BACnetConfirmedServiceACKAtomicWriteFile"
+	return "BACnetConfirmedServiceACKAtomicWriteFile"
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKAtomicWriteFileParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKAtomicWriteFile{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKAtomicWriteFile{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
index 90cd75f..3be273a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKConfirmedPrivateTransfer struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKConfirmedPrivateTransfer
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKConfirmedPrivateTransfer
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKConfirmedPrivateTransfer interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) ServiceChoice() uint8 {
-    return 0x12
+	return 0x12
 }
 
-
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKConfirmedPrivateTransfer() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKConfirmedPrivateTransfer{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKConfirmedPrivateTransfer{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(structType interface{}) *BACnetConfirmedServiceACKConfirmedPrivateTransfer {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKConfirmedPrivateTransfer {
-        if casted, ok := typ.(BACnetConfirmedServiceACKConfirmedPrivateTransfer); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKConfirmedPrivateTransfer); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKConfirmedPrivateTransfer {
+		if casted, ok := typ.(BACnetConfirmedServiceACKConfirmedPrivateTransfer); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKConfirmedPrivateTransfer); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKConfirmedPrivateTransfer(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetTypeName() string {
-    return "BACnetConfirmedServiceACKConfirmedPrivateTransfer"
+	return "BACnetConfirmedServiceACKConfirmedPrivateTransfer"
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKConfirmedPrivateTransferParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKConfirmedPrivateTransfer{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKConfirmedPrivateTransfer{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
index f690cf4..754e363 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKCreateObject struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKCreateObject
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKCreateObject
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKCreateObject interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKCreateObject) ServiceChoice() uint8 {
-    return 0x0A
+	return 0x0A
 }
 
-
 func (m *BACnetConfirmedServiceACKCreateObject) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKCreateObject() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKCreateObject{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKCreateObject{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKCreateObject(structType interface{}) *BACnetConfirmedServiceACKCreateObject {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKCreateObject {
-        if casted, ok := typ.(BACnetConfirmedServiceACKCreateObject); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKCreateObject); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKCreateObject(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKCreateObject(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKCreateObject {
+		if casted, ok := typ.(BACnetConfirmedServiceACKCreateObject); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKCreateObject); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKCreateObject(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKCreateObject(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) GetTypeName() string {
-    return "BACnetConfirmedServiceACKCreateObject"
+	return "BACnetConfirmedServiceACKCreateObject"
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKCreateObjectParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKCreateObject{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKCreateObject{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKCreateObject) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
index 23a36ef..5b7e1e7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKGetAlarmSummary struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKGetAlarmSummary
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKGetAlarmSummary
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKGetAlarmSummary interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) ServiceChoice() uint8 {
-    return 0x03
+	return 0x03
 }
 
-
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKGetAlarmSummary() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKGetAlarmSummary{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKGetAlarmSummary{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKGetAlarmSummary(structType interface{}) *BACnetConfirmedServiceACKGetAlarmSummary {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetAlarmSummary {
-        if casted, ok := typ.(BACnetConfirmedServiceACKGetAlarmSummary); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKGetAlarmSummary); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetAlarmSummary(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetAlarmSummary(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetAlarmSummary {
+		if casted, ok := typ.(BACnetConfirmedServiceACKGetAlarmSummary); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKGetAlarmSummary); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetAlarmSummary(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetAlarmSummary(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetTypeName() string {
-    return "BACnetConfirmedServiceACKGetAlarmSummary"
+	return "BACnetConfirmedServiceACKGetAlarmSummary"
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKGetAlarmSummaryParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKGetAlarmSummary{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKGetAlarmSummary{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
index fa3acdd..4cb3608 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKGetEnrollmentSummary struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKGetEnrollmentSummary
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKGetEnrollmentSummary
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKGetEnrollmentSummary interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) ServiceChoice() uint8 {
-    return 0x04
+	return 0x04
 }
 
-
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKGetEnrollmentSummary() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKGetEnrollmentSummary{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKGetEnrollmentSummary{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKGetEnrollmentSummary(structType interface{}) *BACnetConfirmedServiceACKGetEnrollmentSummary {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetEnrollmentSummary {
-        if casted, ok := typ.(BACnetConfirmedServiceACKGetEnrollmentSummary); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKGetEnrollmentSummary); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetEnrollmentSummary(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetEnrollmentSummary(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetEnrollmentSummary {
+		if casted, ok := typ.(BACnetConfirmedServiceACKGetEnrollmentSummary); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKGetEnrollmentSummary); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetEnrollmentSummary(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetEnrollmentSummary(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetTypeName() string {
-    return "BACnetConfirmedServiceACKGetEnrollmentSummary"
+	return "BACnetConfirmedServiceACKGetEnrollmentSummary"
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKGetEnrollmentSummaryParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKGetEnrollmentSummary{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKGetEnrollmentSummary{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
index c280eb1..3753a9b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKGetEventInformation struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKGetEventInformation
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKGetEventInformation
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKGetEventInformation interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKGetEventInformation) ServiceChoice() uint8 {
-    return 0x1D
+	return 0x1D
 }
 
-
 func (m *BACnetConfirmedServiceACKGetEventInformation) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKGetEventInformation() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKGetEventInformation{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKGetEventInformation{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKGetEventInformation(structType interface{}) *BACnetConfirmedServiceACKGetEventInformation {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetEventInformation {
-        if casted, ok := typ.(BACnetConfirmedServiceACKGetEventInformation); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKGetEventInformation); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetEventInformation(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKGetEventInformation(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKGetEventInformation {
+		if casted, ok := typ.(BACnetConfirmedServiceACKGetEventInformation); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKGetEventInformation); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetEventInformation(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKGetEventInformation(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) GetTypeName() string {
-    return "BACnetConfirmedServiceACKGetEventInformation"
+	return "BACnetConfirmedServiceACKGetEventInformation"
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKGetEventInformationParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKGetEventInformation{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKGetEventInformation{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKGetEventInformation) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
index 49500ef..d3a5373 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKReadProperty struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKReadProperty
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKReadProperty
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKReadProperty interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKReadProperty) ServiceChoice() uint8 {
-    return 0x0C
+	return 0x0C
 }
 
-
 func (m *BACnetConfirmedServiceACKReadProperty) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKReadProperty() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKReadProperty{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKReadProperty{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKReadProperty(structType interface{}) *BACnetConfirmedServiceACKReadProperty {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadProperty {
-        if casted, ok := typ.(BACnetConfirmedServiceACKReadProperty); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKReadProperty); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadProperty(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadProperty(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadProperty {
+		if casted, ok := typ.(BACnetConfirmedServiceACKReadProperty); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKReadProperty); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadProperty(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadProperty(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) GetTypeName() string {
-    return "BACnetConfirmedServiceACKReadProperty"
+	return "BACnetConfirmedServiceACKReadProperty"
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKReadPropertyParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKReadProperty{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKReadProperty{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKReadProperty) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
index 9af64b2..d237c25 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKReadPropertyMultiple struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKReadPropertyMultiple
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKReadPropertyMultiple
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKReadPropertyMultiple interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) ServiceChoice() uint8 {
-    return 0x0E
+	return 0x0E
 }
 
-
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKReadPropertyMultiple() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKReadPropertyMultiple{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKReadPropertyMultiple{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKReadPropertyMultiple(structType interface{}) *BACnetConfirmedServiceACKReadPropertyMultiple {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadPropertyMultiple {
-        if casted, ok := typ.(BACnetConfirmedServiceACKReadPropertyMultiple); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKReadPropertyMultiple); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadPropertyMultiple(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadPropertyMultiple(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadPropertyMultiple {
+		if casted, ok := typ.(BACnetConfirmedServiceACKReadPropertyMultiple); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKReadPropertyMultiple); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadPropertyMultiple(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadPropertyMultiple(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetTypeName() string {
-    return "BACnetConfirmedServiceACKReadPropertyMultiple"
+	return "BACnetConfirmedServiceACKReadPropertyMultiple"
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKReadPropertyMultipleParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKReadPropertyMultiple{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKReadPropertyMultiple{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
index 67e1939..8a6d83b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKReadRange struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKReadRange
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKReadRange
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKReadRange interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKReadRange) ServiceChoice() uint8 {
-    return 0x1A
+	return 0x1A
 }
 
-
 func (m *BACnetConfirmedServiceACKReadRange) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKReadRange() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKReadRange{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKReadRange{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKReadRange(structType interface{}) *BACnetConfirmedServiceACKReadRange {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadRange {
-        if casted, ok := typ.(BACnetConfirmedServiceACKReadRange); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKReadRange); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadRange(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKReadRange(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKReadRange {
+		if casted, ok := typ.(BACnetConfirmedServiceACKReadRange); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKReadRange); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadRange(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKReadRange(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) GetTypeName() string {
-    return "BACnetConfirmedServiceACKReadRange"
+	return "BACnetConfirmedServiceACKReadRange"
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKReadRangeParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKReadRange{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKReadRange{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKReadRange) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
index ac97ad2..def53bf 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKRemovedAuthenticate struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKRemovedAuthenticate
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKRemovedAuthenticate
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKRemovedAuthenticate interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) ServiceChoice() uint8 {
-    return 0x18
+	return 0x18
 }
 
-
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKRemovedAuthenticate() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKRemovedAuthenticate{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKRemovedAuthenticate{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKRemovedAuthenticate(structType interface{}) *BACnetConfirmedServiceACKRemovedAuthenticate {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKRemovedAuthenticate {
-        if casted, ok := typ.(BACnetConfirmedServiceACKRemovedAuthenticate); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKRemovedAuthenticate); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKRemovedAuthenticate(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKRemovedAuthenticate(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKRemovedAuthenticate {
+		if casted, ok := typ.(BACnetConfirmedServiceACKRemovedAuthenticate); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKRemovedAuthenticate); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKRemovedAuthenticate(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKRemovedAuthenticate(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetTypeName() string {
-    return "BACnetConfirmedServiceACKRemovedAuthenticate"
+	return "BACnetConfirmedServiceACKRemovedAuthenticate"
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKRemovedAuthenticateParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKRemovedAuthenticate{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKRemovedAuthenticate{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
index c1cfe3f..0362799 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKRemovedReadPropertyConditional struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKRemovedReadPropertyConditional
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKRemovedReadPropertyConditional
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKRemovedReadPropertyConditional interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) ServiceChoice() uint8 {
-    return 0x0D
+	return 0x0D
 }
 
-
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKRemovedReadPropertyConditional() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKRemovedReadPropertyConditional{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKRemovedReadPropertyConditional{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(structType interface{}) *BACnetConfirmedServiceACKRemovedReadPropertyConditional {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKRemovedReadPropertyConditional {
-        if casted, ok := typ.(BACnetConfirmedServiceACKRemovedReadPropertyConditional); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKRemovedReadPropertyConditional); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKRemovedReadPropertyConditional {
+		if casted, ok := typ.(BACnetConfirmedServiceACKRemovedReadPropertyConditional); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKRemovedReadPropertyConditional); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKRemovedReadPropertyConditional(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetTypeName() string {
-    return "BACnetConfirmedServiceACKRemovedReadPropertyConditional"
+	return "BACnetConfirmedServiceACKRemovedReadPropertyConditional"
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKRemovedReadPropertyConditionalParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKRemovedReadPropertyConditional{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKRemovedReadPropertyConditional{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
index ea64413..7deb9ef 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKVTData struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKVTData
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKVTData
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKVTData interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKVTData) ServiceChoice() uint8 {
-    return 0x17
+	return 0x17
 }
 
-
 func (m *BACnetConfirmedServiceACKVTData) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKVTData() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKVTData{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKVTData{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKVTData(structType interface{}) *BACnetConfirmedServiceACKVTData {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKVTData {
-        if casted, ok := typ.(BACnetConfirmedServiceACKVTData); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKVTData); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKVTData(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKVTData(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKVTData {
+		if casted, ok := typ.(BACnetConfirmedServiceACKVTData); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKVTData); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKVTData(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKVTData(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKVTData) GetTypeName() string {
-    return "BACnetConfirmedServiceACKVTData"
+	return "BACnetConfirmedServiceACKVTData"
 }
 
 func (m *BACnetConfirmedServiceACKVTData) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKVTData) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKVTDataParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKVTData{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKVTData{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKVTData) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKVTData) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKVTData) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
index bb5cb2a..dac29f7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceACKVTOpen struct {
-    Parent *BACnetConfirmedServiceACK
-    IBACnetConfirmedServiceACKVTOpen
+	Parent *BACnetConfirmedServiceACK
+	IBACnetConfirmedServiceACKVTOpen
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceACKVTOpen interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceACKVTOpen) ServiceChoice() uint8 {
-    return 0x15
+	return 0x15
 }
 
-
 func (m *BACnetConfirmedServiceACKVTOpen) InitializeParent(parent *BACnetConfirmedServiceACK) {
 }
 
 func NewBACnetConfirmedServiceACKVTOpen() *BACnetConfirmedServiceACK {
-    child := &BACnetConfirmedServiceACKVTOpen{
-        Parent: NewBACnetConfirmedServiceACK(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceACKVTOpen{
+		Parent: NewBACnetConfirmedServiceACK(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceACKVTOpen(structType interface{}) *BACnetConfirmedServiceACKVTOpen {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceACKVTOpen {
-        if casted, ok := typ.(BACnetConfirmedServiceACKVTOpen); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACKVTOpen); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKVTOpen(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
-            return CastBACnetConfirmedServiceACKVTOpen(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceACKVTOpen {
+		if casted, ok := typ.(BACnetConfirmedServiceACKVTOpen); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACKVTOpen); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKVTOpen(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceACK); ok {
+			return CastBACnetConfirmedServiceACKVTOpen(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) GetTypeName() string {
-    return "BACnetConfirmedServiceACKVTOpen"
+	return "BACnetConfirmedServiceACKVTOpen"
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceACKVTOpenParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceACK, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceACKVTOpen{
-        Parent: &BACnetConfirmedServiceACK{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceACKVTOpen{
+		Parent: &BACnetConfirmedServiceACK{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceACKVTOpen) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index facbbbd..7a23276 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -19,596 +19,595 @@
 package model
 
 import (
-    "encoding/xml"
-    "errors"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
-    "reflect"
-    "strings"
+	"encoding/xml"
+	"errors"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
+	"reflect"
+	"strings"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceRequest struct {
-    Child IBACnetConfirmedServiceRequestChild
-    IBACnetConfirmedServiceRequest
-    IBACnetConfirmedServiceRequestParent
+	Child IBACnetConfirmedServiceRequestChild
+	IBACnetConfirmedServiceRequest
+	IBACnetConfirmedServiceRequestParent
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequest interface {
-    ServiceChoice() uint8
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	ServiceChoice() uint8
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 type IBACnetConfirmedServiceRequestParent interface {
-    SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceRequest, serializeChildFunction func() error) error
-    GetTypeName() string
+	SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceRequest, serializeChildFunction func() error) error
+	GetTypeName() string
 }
 
 type IBACnetConfirmedServiceRequestChild interface {
-    Serialize(io utils.WriteBuffer) error
-    InitializeParent(parent *BACnetConfirmedServiceRequest)
-    GetTypeName() string
-    IBACnetConfirmedServiceRequest
+	Serialize(io utils.WriteBuffer) error
+	InitializeParent(parent *BACnetConfirmedServiceRequest)
+	GetTypeName() string
+	IBACnetConfirmedServiceRequest
 }
 
 func NewBACnetConfirmedServiceRequest() *BACnetConfirmedServiceRequest {
-    return &BACnetConfirmedServiceRequest{}
+	return &BACnetConfirmedServiceRequest{}
 }
 
 func CastBACnetConfirmedServiceRequest(structType interface{}) *BACnetConfirmedServiceRequest {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceRequest {
-        if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
-            return casted
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceRequest {
+		if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
+			return casted
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceRequest) GetTypeName() string {
-    return "BACnetConfirmedServiceRequest"
+	return "BACnetConfirmedServiceRequest"
 }
 
 func (m *BACnetConfirmedServiceRequest) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    // Discriminator Field (serviceChoice)
-    lengthInBits += 8
+	// Discriminator Field (serviceChoice)
+	lengthInBits += 8
 
-    // Length of sub-type elements will be added by sub-type...
-    lengthInBits += m.Child.LengthInBits()
+	// Length of sub-type elements will be added by sub-type...
+	lengthInBits += m.Child.LengthInBits()
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceRequest) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceRequestParse(io *utils.ReadBuffer, len uint16) (*BACnetConfirmedServiceRequest, error) {
 
-    // Discriminator Field (serviceChoice) (Used as input to a switch field)
-    serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
-    if _serviceChoiceErr != nil {
-        return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
+	// Discriminator Field (serviceChoice) (Used as input to a switch field)
+	serviceChoice, _serviceChoiceErr := io.ReadUint8(8)
+	if _serviceChoiceErr != nil {
+		return nil, errors.New("Error parsing 'serviceChoice' field " + _serviceChoiceErr.Error())
+	}
 
-    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
-    var _parent *BACnetConfirmedServiceRequest
-    var typeSwitchError error
-    switch {
-    case serviceChoice == 0x00:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestAcknowledgeAlarmParse(io)
-    case serviceChoice == 0x01:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(io, len)
-    case serviceChoice == 0x02:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedEventNotificationParse(io)
-    case serviceChoice == 0x04:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(io)
-    case serviceChoice == 0x05:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVParse(io)
-    case serviceChoice == 0x06:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestAtomicReadFileParse(io)
-    case serviceChoice == 0x07:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestAtomicWriteFileParse(io)
-    case serviceChoice == 0x08:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestAddListElementParse(io)
-    case serviceChoice == 0x09:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestRemoveListElementParse(io)
-    case serviceChoice == 0x0A:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestCreateObjectParse(io)
-    case serviceChoice == 0x0B:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestDeleteObjectParse(io)
-    case serviceChoice == 0x0C:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyParse(io)
-    case serviceChoice == 0x0E:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyMultipleParse(io)
-    case serviceChoice == 0x0F:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyParse(io, len)
-    case serviceChoice == 0x10:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyMultipleParse(io)
-    case serviceChoice == 0x11:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestDeviceCommunicationControlParse(io)
-    case serviceChoice == 0x12:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedPrivateTransferParse(io)
-    case serviceChoice == 0x13:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedTextMessageParse(io)
-    case serviceChoice == 0x14:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestReinitializeDeviceParse(io)
-    case serviceChoice == 0x15:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestVTOpenParse(io)
-    case serviceChoice == 0x16:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestVTCloseParse(io)
-    case serviceChoice == 0x17:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestVTDataParse(io)
-    case serviceChoice == 0x18:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedAuthenticateParse(io)
-    case serviceChoice == 0x19:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedRequestKeyParse(io)
-    case serviceChoice == 0x0D:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedReadPropertyConditionalParse(io)
-    case serviceChoice == 0x1A:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestReadRangeParse(io)
-    case serviceChoice == 0x1B:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestLifeSafetyOperationParse(io)
-    case serviceChoice == 0x1C:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(io)
-    case serviceChoice == 0x1D:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestGetEventInformationParse(io)
-    case serviceChoice == 0x1E:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(io)
-    case serviceChoice == 0x1F:
-        _parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(io)
-    }
-    if typeSwitchError != nil {
-        return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
-    }
+	// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+	var _parent *BACnetConfirmedServiceRequest
+	var typeSwitchError error
+	switch {
+	case serviceChoice == 0x00:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestAcknowledgeAlarmParse(io)
+	case serviceChoice == 0x01:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(io, len)
+	case serviceChoice == 0x02:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedEventNotificationParse(io)
+	case serviceChoice == 0x04:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(io)
+	case serviceChoice == 0x05:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVParse(io)
+	case serviceChoice == 0x06:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestAtomicReadFileParse(io)
+	case serviceChoice == 0x07:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestAtomicWriteFileParse(io)
+	case serviceChoice == 0x08:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestAddListElementParse(io)
+	case serviceChoice == 0x09:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestRemoveListElementParse(io)
+	case serviceChoice == 0x0A:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestCreateObjectParse(io)
+	case serviceChoice == 0x0B:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestDeleteObjectParse(io)
+	case serviceChoice == 0x0C:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyParse(io)
+	case serviceChoice == 0x0E:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyMultipleParse(io)
+	case serviceChoice == 0x0F:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyParse(io, len)
+	case serviceChoice == 0x10:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyMultipleParse(io)
+	case serviceChoice == 0x11:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestDeviceCommunicationControlParse(io)
+	case serviceChoice == 0x12:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedPrivateTransferParse(io)
+	case serviceChoice == 0x13:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedTextMessageParse(io)
+	case serviceChoice == 0x14:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestReinitializeDeviceParse(io)
+	case serviceChoice == 0x15:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestVTOpenParse(io)
+	case serviceChoice == 0x16:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestVTCloseParse(io)
+	case serviceChoice == 0x17:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestVTDataParse(io)
+	case serviceChoice == 0x18:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedAuthenticateParse(io)
+	case serviceChoice == 0x19:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedRequestKeyParse(io)
+	case serviceChoice == 0x0D:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestRemovedReadPropertyConditionalParse(io)
+	case serviceChoice == 0x1A:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestReadRangeParse(io)
+	case serviceChoice == 0x1B:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestLifeSafetyOperationParse(io)
+	case serviceChoice == 0x1C:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(io)
+	case serviceChoice == 0x1D:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestGetEventInformationParse(io)
+	case serviceChoice == 0x1E:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(io)
+	case serviceChoice == 0x1F:
+		_parent, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(io)
+	}
+	if typeSwitchError != nil {
+		return nil, errors.New("Error parsing sub-type for type-switch. " + typeSwitchError.Error())
+	}
 
-    // Finish initializing
-    _parent.Child.InitializeParent(_parent)
-    return _parent, nil
+	// Finish initializing
+	_parent.Child.InitializeParent(_parent)
+	return _parent, nil
 }
 
 func (m *BACnetConfirmedServiceRequest) Serialize(io utils.WriteBuffer) error {
-    return m.Child.Serialize(io)
+	return m.Child.Serialize(io)
 }
 
 func (m *BACnetConfirmedServiceRequest) SerializeParent(io utils.WriteBuffer, child IBACnetConfirmedServiceRequest, serializeChildFunction func() error) error {
 
-    // Discriminator Field (serviceChoice) (Used as input to a switch field)
-    serviceChoice := uint8(child.ServiceChoice())
-    _serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
-    if _serviceChoiceErr != nil {
-        return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
-    }
+	// Discriminator Field (serviceChoice) (Used as input to a switch field)
+	serviceChoice := uint8(child.ServiceChoice())
+	_serviceChoiceErr := io.WriteUint8(8, (serviceChoice))
+	if _serviceChoiceErr != nil {
+		return errors.New("Error serializing 'serviceChoice' field " + _serviceChoiceErr.Error())
+	}
 
-    // Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
-    _typeSwitchErr := serializeChildFunction()
-    if _typeSwitchErr != nil {
-        return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
-    }
+	// Switch field (Depending on the discriminator values, passes the serialization to a sub-type)
+	_typeSwitchErr := serializeChildFunction()
+	if _typeSwitchErr != nil {
+		return errors.New("Error serializing sub-type field " + _typeSwitchErr.Error())
+	}
 
-    return nil
+	return nil
 }
 
 func (m *BACnetConfirmedServiceRequest) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    for {
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            default:
-                switch start.Attr[0].Value {
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAcknowledgeAlarm":
-                        var dt *BACnetConfirmedServiceRequestAcknowledgeAlarm
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestAcknowledgeAlarm)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedCOVNotification":
-                        var dt *BACnetConfirmedServiceRequestConfirmedCOVNotification
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedCOVNotification)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedEventNotification":
-                        var dt *BACnetConfirmedServiceRequestConfirmedEventNotification
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedEventNotification)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestGetEnrollmentSummary":
-                        var dt *BACnetConfirmedServiceRequestGetEnrollmentSummary
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestGetEnrollmentSummary)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOV":
-                        var dt *BACnetConfirmedServiceRequestSubscribeCOV
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOV)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAtomicReadFile":
-                        var dt *BACnetConfirmedServiceRequestAtomicReadFile
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestAtomicReadFile)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAtomicWriteFile":
-                        var dt *BACnetConfirmedServiceRequestAtomicWriteFile
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestAtomicWriteFile)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAddListElement":
-                        var dt *BACnetConfirmedServiceRequestAddListElement
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestAddListElement)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemoveListElement":
-                        var dt *BACnetConfirmedServiceRequestRemoveListElement
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestRemoveListElement)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestCreateObject":
-                        var dt *BACnetConfirmedServiceRequestCreateObject
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestCreateObject)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestDeleteObject":
-                        var dt *BACnetConfirmedServiceRequestDeleteObject
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestDeleteObject)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadProperty":
-                        var dt *BACnetConfirmedServiceRequestReadProperty
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestReadProperty)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadPropertyMultiple":
-                        var dt *BACnetConfirmedServiceRequestReadPropertyMultiple
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestReadPropertyMultiple)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestWriteProperty":
-                        var dt *BACnetConfirmedServiceRequestWriteProperty
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestWriteProperty)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestWritePropertyMultiple":
-                        var dt *BACnetConfirmedServiceRequestWritePropertyMultiple
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestWritePropertyMultiple)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestDeviceCommunicationControl":
-                        var dt *BACnetConfirmedServiceRequestDeviceCommunicationControl
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestDeviceCommunicationControl)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedPrivateTransfer":
-                        var dt *BACnetConfirmedServiceRequestConfirmedPrivateTransfer
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedPrivateTransfer)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedTextMessage":
-                        var dt *BACnetConfirmedServiceRequestConfirmedTextMessage
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedTextMessage)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReinitializeDevice":
-                        var dt *BACnetConfirmedServiceRequestReinitializeDevice
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestReinitializeDevice)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTOpen":
-                        var dt *BACnetConfirmedServiceRequestVTOpen
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestVTOpen)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTClose":
-                        var dt *BACnetConfirmedServiceRequestVTClose
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestVTClose)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTData":
-                        var dt *BACnetConfirmedServiceRequestVTData
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestVTData)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedAuthenticate":
-                        var dt *BACnetConfirmedServiceRequestRemovedAuthenticate
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestRemovedAuthenticate)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedRequestKey":
-                        var dt *BACnetConfirmedServiceRequestRemovedRequestKey
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestRemovedRequestKey)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedReadPropertyConditional":
-                        var dt *BACnetConfirmedServiceRequestRemovedReadPropertyConditional
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestRemovedReadPropertyConditional)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadRange":
-                        var dt *BACnetConfirmedServiceRequestReadRange
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestReadRange)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestLifeSafetyOperation":
-                        var dt *BACnetConfirmedServiceRequestLifeSafetyOperation
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestLifeSafetyOperation)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOVProperty":
-                        var dt *BACnetConfirmedServiceRequestSubscribeCOVProperty
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOVProperty)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestGetEventInformation":
-                        var dt *BACnetConfirmedServiceRequestGetEventInformation
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestGetEventInformation)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple":
-                        var dt *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                    case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple":
-                        var dt *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
-                        if m.Child != nil {
-                            dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple)
-                        }
-                        if err := d.DecodeElement(&dt, &tok); err != nil {
-                            return err
-                        }
-                        if m.Child == nil {
-                            dt.Parent = m
-                            m.Child = dt
-                        }
-                }
-            }
-        }
-    }
+	var token xml.Token
+	var err error
+	for {
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			default:
+				switch start.Attr[0].Value {
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAcknowledgeAlarm":
+					var dt *BACnetConfirmedServiceRequestAcknowledgeAlarm
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestAcknowledgeAlarm)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedCOVNotification":
+					var dt *BACnetConfirmedServiceRequestConfirmedCOVNotification
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedCOVNotification)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedEventNotification":
+					var dt *BACnetConfirmedServiceRequestConfirmedEventNotification
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedEventNotification)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestGetEnrollmentSummary":
+					var dt *BACnetConfirmedServiceRequestGetEnrollmentSummary
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestGetEnrollmentSummary)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOV":
+					var dt *BACnetConfirmedServiceRequestSubscribeCOV
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOV)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAtomicReadFile":
+					var dt *BACnetConfirmedServiceRequestAtomicReadFile
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestAtomicReadFile)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAtomicWriteFile":
+					var dt *BACnetConfirmedServiceRequestAtomicWriteFile
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestAtomicWriteFile)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestAddListElement":
+					var dt *BACnetConfirmedServiceRequestAddListElement
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestAddListElement)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemoveListElement":
+					var dt *BACnetConfirmedServiceRequestRemoveListElement
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestRemoveListElement)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestCreateObject":
+					var dt *BACnetConfirmedServiceRequestCreateObject
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestCreateObject)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestDeleteObject":
+					var dt *BACnetConfirmedServiceRequestDeleteObject
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestDeleteObject)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadProperty":
+					var dt *BACnetConfirmedServiceRequestReadProperty
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestReadProperty)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadPropertyMultiple":
+					var dt *BACnetConfirmedServiceRequestReadPropertyMultiple
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestReadPropertyMultiple)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestWriteProperty":
+					var dt *BACnetConfirmedServiceRequestWriteProperty
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestWriteProperty)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestWritePropertyMultiple":
+					var dt *BACnetConfirmedServiceRequestWritePropertyMultiple
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestWritePropertyMultiple)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestDeviceCommunicationControl":
+					var dt *BACnetConfirmedServiceRequestDeviceCommunicationControl
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestDeviceCommunicationControl)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedPrivateTransfer":
+					var dt *BACnetConfirmedServiceRequestConfirmedPrivateTransfer
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedPrivateTransfer)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedTextMessage":
+					var dt *BACnetConfirmedServiceRequestConfirmedTextMessage
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedTextMessage)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReinitializeDevice":
+					var dt *BACnetConfirmedServiceRequestReinitializeDevice
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestReinitializeDevice)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTOpen":
+					var dt *BACnetConfirmedServiceRequestVTOpen
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestVTOpen)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTClose":
+					var dt *BACnetConfirmedServiceRequestVTClose
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestVTClose)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestVTData":
+					var dt *BACnetConfirmedServiceRequestVTData
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestVTData)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedAuthenticate":
+					var dt *BACnetConfirmedServiceRequestRemovedAuthenticate
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestRemovedAuthenticate)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedRequestKey":
+					var dt *BACnetConfirmedServiceRequestRemovedRequestKey
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestRemovedRequestKey)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestRemovedReadPropertyConditional":
+					var dt *BACnetConfirmedServiceRequestRemovedReadPropertyConditional
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestRemovedReadPropertyConditional)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestReadRange":
+					var dt *BACnetConfirmedServiceRequestReadRange
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestReadRange)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestLifeSafetyOperation":
+					var dt *BACnetConfirmedServiceRequestLifeSafetyOperation
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestLifeSafetyOperation)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOVProperty":
+					var dt *BACnetConfirmedServiceRequestSubscribeCOVProperty
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOVProperty)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestGetEventInformation":
+					var dt *BACnetConfirmedServiceRequestGetEventInformation
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestGetEventInformation)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple":
+					var dt *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				case "org.apache.plc4x.java.bacnetip.readwrite.BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple":
+					var dt *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+					if m.Child != nil {
+						dt = m.Child.(*BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple)
+					}
+					if err := d.DecodeElement(&dt, &tok); err != nil {
+						return err
+					}
+					if m.Child == nil {
+						dt.Parent = m
+						m.Child = dt
+					}
+				}
+			}
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceRequest) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    className := reflect.TypeOf(m.Child).String()
-    className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".") + 1:]
-    if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
-            {Name: xml.Name{Local: "className"}, Value: className},
-        }}); err != nil {
-        return err
-    }
-    marshaller, ok := m.Child.(xml.Marshaler)
-    if !ok {
-        return errors.New("child is not castable to Marshaler")
-    }
-    marshaller.MarshalXML(e, start)
-    if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
-        return err
-    }
-    return nil
+	className := reflect.TypeOf(m.Child).String()
+	className = "org.apache.plc4x.java.bacnetip.readwrite." + className[strings.LastIndex(className, ".")+1:]
+	if err := e.EncodeToken(xml.StartElement{Name: start.Name, Attr: []xml.Attr{
+		{Name: xml.Name{Local: "className"}, Value: className},
+	}}); err != nil {
+		return err
+	}
+	marshaller, ok := m.Child.(xml.Marshaler)
+	if !ok {
+		return errors.New("child is not castable to Marshaler")
+	}
+	marshaller.MarshalXML(e, start)
+	if err := e.EncodeToken(xml.EndElement{Name: start.Name}); err != nil {
+		return err
+	}
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index fb6cece..673f16c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceRequestAcknowledgeAlarm struct {
-    Parent *BACnetConfirmedServiceRequest
-    IBACnetConfirmedServiceRequestAcknowledgeAlarm
+	Parent *BACnetConfirmedServiceRequest
+	IBACnetConfirmedServiceRequestAcknowledgeAlarm
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAcknowledgeAlarm interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) ServiceChoice() uint8 {
-    return 0x00
+	return 0x00
 }
 
-
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
 func NewBACnetConfirmedServiceRequestAcknowledgeAlarm() *BACnetConfirmedServiceRequest {
-    child := &BACnetConfirmedServiceRequestAcknowledgeAlarm{
-        Parent: NewBACnetConfirmedServiceRequest(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceRequestAcknowledgeAlarm{
+		Parent: NewBACnetConfirmedServiceRequest(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceRequestAcknowledgeAlarm(structType interface{}) *BACnetConfirmedServiceRequestAcknowledgeAlarm {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAcknowledgeAlarm {
-        if casted, ok := typ.(BACnetConfirmedServiceRequestAcknowledgeAlarm); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequestAcknowledgeAlarm); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAcknowledgeAlarm(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAcknowledgeAlarm(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAcknowledgeAlarm {
+		if casted, ok := typ.(BACnetConfirmedServiceRequestAcknowledgeAlarm); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequestAcknowledgeAlarm); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAcknowledgeAlarm(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAcknowledgeAlarm(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetTypeName() string {
-    return "BACnetConfirmedServiceRequestAcknowledgeAlarm"
+	return "BACnetConfirmedServiceRequestAcknowledgeAlarm"
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceRequestAcknowledgeAlarmParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceRequest, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceRequestAcknowledgeAlarm{
-        Parent: &BACnetConfirmedServiceRequest{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceRequestAcknowledgeAlarm{
+		Parent: &BACnetConfirmedServiceRequest{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index 4527b8f..1b9f458 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceRequestAddListElement struct {
-    Parent *BACnetConfirmedServiceRequest
-    IBACnetConfirmedServiceRequestAddListElement
+	Parent *BACnetConfirmedServiceRequest
+	IBACnetConfirmedServiceRequestAddListElement
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAddListElement interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceRequestAddListElement) ServiceChoice() uint8 {
-    return 0x08
+	return 0x08
 }
 
-
 func (m *BACnetConfirmedServiceRequestAddListElement) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
 func NewBACnetConfirmedServiceRequestAddListElement() *BACnetConfirmedServiceRequest {
-    child := &BACnetConfirmedServiceRequestAddListElement{
-        Parent: NewBACnetConfirmedServiceRequest(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceRequestAddListElement{
+		Parent: NewBACnetConfirmedServiceRequest(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceRequestAddListElement(structType interface{}) *BACnetConfirmedServiceRequestAddListElement {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAddListElement {
-        if casted, ok := typ.(BACnetConfirmedServiceRequestAddListElement); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequestAddListElement); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAddListElement(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAddListElement(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAddListElement {
+		if casted, ok := typ.(BACnetConfirmedServiceRequestAddListElement); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequestAddListElement); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAddListElement(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAddListElement(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) GetTypeName() string {
-    return "BACnetConfirmedServiceRequestAddListElement"
+	return "BACnetConfirmedServiceRequestAddListElement"
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceRequestAddListElementParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceRequest, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceRequestAddListElement{
-        Parent: &BACnetConfirmedServiceRequest{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceRequestAddListElement{
+		Parent: &BACnetConfirmedServiceRequest{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceRequestAddListElement) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index 9198bbd..a786d87 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceRequestAtomicReadFile struct {
-    Parent *BACnetConfirmedServiceRequest
-    IBACnetConfirmedServiceRequestAtomicReadFile
+	Parent *BACnetConfirmedServiceRequest
+	IBACnetConfirmedServiceRequestAtomicReadFile
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicReadFile interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) ServiceChoice() uint8 {
-    return 0x06
+	return 0x06
 }
 
-
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
 func NewBACnetConfirmedServiceRequestAtomicReadFile() *BACnetConfirmedServiceRequest {
-    child := &BACnetConfirmedServiceRequestAtomicReadFile{
-        Parent: NewBACnetConfirmedServiceRequest(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceRequestAtomicReadFile{
+		Parent: NewBACnetConfirmedServiceRequest(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceRequestAtomicReadFile(structType interface{}) *BACnetConfirmedServiceRequestAtomicReadFile {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAtomicReadFile {
-        if casted, ok := typ.(BACnetConfirmedServiceRequestAtomicReadFile); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequestAtomicReadFile); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAtomicReadFile(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAtomicReadFile(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAtomicReadFile {
+		if casted, ok := typ.(BACnetConfirmedServiceRequestAtomicReadFile); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequestAtomicReadFile); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAtomicReadFile(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAtomicReadFile(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetTypeName() string {
-    return "BACnetConfirmedServiceRequestAtomicReadFile"
+	return "BACnetConfirmedServiceRequestAtomicReadFile"
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceRequestAtomicReadFileParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceRequest, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceRequestAtomicReadFile{
-        Parent: &BACnetConfirmedServiceRequest{},
-    }
-    _child.Parent.Child = _child
-    return _child.Parent, nil
+	// Create a partially initialized instance
+	_child := &BACnetConfirmedServiceRequestAtomicReadFile{
+		Parent: &BACnetConfirmedServiceRequest{},
+	}
+	_child.Parent.Child = _child
+	return _child.Parent, nil
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) Serialize(io utils.WriteBuffer) error {
-    ser := func() error {
+	ser := func() error {
 
-        return nil
-    }
-    return m.Parent.SerializeParent(io, m, ser)
+		return nil
+	}
+	return m.Parent.SerializeParent(io, m, ser)
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-    var token xml.Token
-    var err error
-    token = start
-    for {
-        switch token.(type) {
-        case xml.StartElement:
-            tok := token.(xml.StartElement)
-            switch tok.Name.Local {
-            }
-        }
-        token, err = d.Token()
-        if err != nil {
-            if err == io.EOF {
-                return nil
-            }
-            return err
-        }
-    }
+	var token xml.Token
+	var err error
+	token = start
+	for {
+		switch token.(type) {
+		case xml.StartElement:
+			tok := token.(xml.StartElement)
+			switch tok.Name.Local {
+			}
+		}
+		token, err = d.Token()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+	}
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-    return nil
+	return nil
 }
-
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 5012e62..47417b7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -19,117 +19,115 @@
 package model
 
 import (
-    "encoding/xml"
-    "io"
-    "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"encoding/xml"
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"io"
 )
 
 // The data-structure of this message
 type BACnetConfirmedServiceRequestAtomicWriteFile struct {
-    Parent *BACnetConfirmedServiceRequest
-    IBACnetConfirmedServiceRequestAtomicWriteFile
+	Parent *BACnetConfirmedServiceRequest
+	IBACnetConfirmedServiceRequestAtomicWriteFile
 }
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicWriteFile interface {
-    LengthInBytes() uint16
-    LengthInBits() uint16
-    Serialize(io utils.WriteBuffer) error
-    xml.Marshaler
+	LengthInBytes() uint16
+	LengthInBits() uint16
+	Serialize(io utils.WriteBuffer) error
+	xml.Marshaler
 }
 
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) ServiceChoice() uint8 {
-    return 0x07
+	return 0x07
 }
 
-
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
 func NewBACnetConfirmedServiceRequestAtomicWriteFile() *BACnetConfirmedServiceRequest {
-    child := &BACnetConfirmedServiceRequestAtomicWriteFile{
-        Parent: NewBACnetConfirmedServiceRequest(),
-    }
-    child.Parent.Child = child
-    return child.Parent
+	child := &BACnetConfirmedServiceRequestAtomicWriteFile{
+		Parent: NewBACnetConfirmedServiceRequest(),
+	}
+	child.Parent.Child = child
+	return child.Parent
 }
 
 func CastBACnetConfirmedServiceRequestAtomicWriteFile(structType interface{}) *BACnetConfirmedServiceRequestAtomicWriteFile {
-    castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAtomicWriteFile {
-        if casted, ok := typ.(BACnetConfirmedServiceRequestAtomicWriteFile); ok {
-            return &casted
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequestAtomicWriteFile); ok {
-            return casted
-        }
-        if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAtomicWriteFile(casted.Child)
-        }
-        if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
-            return CastBACnetConfirmedServiceRequestAtomicWriteFile(casted.Child)
-        }
-        return nil
-    }
-    return castFunc(structType)
+	castFunc := func(typ interface{}) *BACnetConfirmedServiceRequestAtomicWriteFile {
+		if casted, ok := typ.(BACnetConfirmedServiceRequestAtomicWriteFile); ok {
+			return &casted
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequestAtomicWriteFile); ok {
+			return casted
+		}
+		if casted, ok := typ.(BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAtomicWriteFile(casted.Child)
+		}
+		if casted, ok := typ.(*BACnetConfirmedServiceRequest); ok {
+			return CastBACnetConfirmedServiceRequestAtomicWriteFile(casted.Child)
+		}
+		return nil
+	}
+	return castFunc(structType)
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetTypeName() string {
-    return "BACnetConfirmedServiceRequestAtomicWriteFile"
+	return "BACnetConfirmedServiceRequestAtomicWriteFile"
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBits() uint16 {
-    lengthInBits := uint16(0)
+	lengthInBits := uint16(0)
 
-    return lengthInBits
+	return lengthInBits
 }
 
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) LengthInBytes() uint16 {
-    return m.LengthInBits() / 8
+	return m.LengthInBits() / 8
 }
 
 func BACnetConfirmedServiceRequestAtomicWriteFileParse(io *utils.ReadBuffer) (*BACnetConfirmedServiceRequest, error) {
 
-    // Create a partially initialized instance
-    _child := &BACnetConfirmedServiceRequestAtomicWriteFile{
-        Parent: &BACnetConfirmedServiceRequest{},
... 90553 lines suppressed ...