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 2023/01/27 12:40:29 UTC

[plc4x] branch develop updated: refactor(code-gen): Introduced two code-gen options: generate-properties-for-parser-arguments and generate-properties-for-reserved-fields

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 d40f7d6097 refactor(code-gen): Introduced two code-gen options: generate-properties-for-parser-arguments and generate-properties-for-reserved-fields
d40f7d6097 is described below

commit d40f7d6097768845de1ed98e9ae646399d8a0b05
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Jan 27 13:36:07 2023 +0100

    refactor(code-gen): Introduced two code-gen options: generate-properties-for-parser-arguments and generate-properties-for-reserved-fields
    
    - Refactored the existing drivers to no longer require parserArgument fields.
---
 .../BaseFreemarkerLanguageTemplateHelper.java      |   21 +-
 .../plc4x/language/java/JavaLanguageOutput.java    |    8 +-
 .../language/java/JavaLanguageTemplateHelper.java  |    8 +
 .../templates/java/complex-type-template.java.ftlh |  293 +++--
 .../definitions/DefaultComplexTypeDefinition.java  |   10 +-
 .../model/BACnetConfirmedServiceRequest.go         |   14 +-
 .../BACnetConfirmedServiceRequestAuthenticate.go   |    8 +-
 ...nfirmedServiceRequestReadPropertyConditional.go |    8 +-
 ...tConfirmedServiceRequestReadPropertyMultiple.go |    8 +-
 .../BACnetConfirmedServiceRequestRequestKey.go     |    8 +-
 .../model/BACnetConfirmedServiceRequestUnknown.go  |    8 +-
 .../model/BACnetConfirmedServiceRequestVTClose.go  |    8 +-
 ...ConfirmedServiceRequestWritePropertyMultiple.go |    8 +-
 .../bacnetip/readwrite/model/BACnetContextTag.go   |   18 +-
 .../readwrite/model/BACnetContextTagBitString.go   |    6 +-
 .../readwrite/model/BACnetContextTagBoolean.go     |    6 +-
 .../model/BACnetContextTagCharacterString.go       |    6 +-
 .../readwrite/model/BACnetContextTagEnumerated.go  |    6 +-
 .../readwrite/model/BACnetContextTagNull.go        |    6 +-
 .../readwrite/model/BACnetContextTagOctetString.go |    6 +-
 .../model/BACnetContextTagSignedInteger.go         |    6 +-
 .../readwrite/model/BACnetContextTagUnknown.go     |    8 +-
 .../model/BACnetContextTagUnsignedInteger.go       |    6 +-
 .../model/BACnetNotificationParameters.go          |   40 +-
 .../BACnetNotificationParametersAccessEvent.go     |    6 +-
 .../BACnetNotificationParametersBufferReady.go     |    6 +-
 ...ACnetNotificationParametersChangeOfBitString.go |    6 +-
 ...otificationParametersChangeOfCharacterString.go |    6 +-
 ...tNotificationParametersChangeOfDiscreteValue.go |    6 +-
 ...CnetNotificationParametersChangeOfLifeSafety.go |    6 +-
 ...netNotificationParametersChangeOfReliability.go |    6 +-
 .../BACnetNotificationParametersChangeOfState.go   |    6 +-
 ...netNotificationParametersChangeOfStatusFlags.go |    6 +-
 .../BACnetNotificationParametersChangeOfTimer.go   |    6 +-
 .../BACnetNotificationParametersChangeOfValue.go   |    6 +-
 ...tNotificationParametersChangeOfValueNewValue.go |    4 +-
 ...onParametersChangeOfValueNewValueChangedBits.go |    6 +-
 ...nParametersChangeOfValueNewValueChangedValue.go |    6 +-
 .../BACnetNotificationParametersCommandFailure.go  |    6 +-
 ...BACnetNotificationParametersComplexEventType.go |    6 +-
 ...BACnetNotificationParametersDoubleOutOfRange.go |    6 +-
 .../model/BACnetNotificationParametersExtended.go  |    6 +-
 .../BACnetNotificationParametersFloatingLimit.go   |    6 +-
 .../BACnetNotificationParametersOutOfRange.go      |    6 +-
 ...BACnetNotificationParametersSignedOutOfRange.go |    6 +-
 ...CnetNotificationParametersUnsignedOutOfRange.go |    6 +-
 .../BACnetNotificationParametersUnsignedRange.go   |    6 +-
 .../bacnetip/readwrite/model/BACnetServiceAck.go   |    8 +-
 .../model/BACnetServiceAckAuthenticate.go          |    8 +-
 .../BACnetServiceAckReadPropertyConditional.go     |    8 +-
 .../model/BACnetServiceAckReadPropertyMultiple.go  |    8 +-
 .../readwrite/model/BACnetServiceAckRequestKey.go  |    8 +-
 plc4go/protocols/cbus/readwrite/model/CALData.go   |   10 +-
 .../cbus/readwrite/model/CALDataIdentifyReply.go   |    6 +-
 .../protocols/cbus/readwrite/model/CALDataReply.go |    6 +-
 .../cbus/readwrite/model/CALDataStatus.go          |    6 +-
 .../cbus/readwrite/model/CALDataStatusExtended.go  |    6 +-
 .../protocols/cbus/readwrite/model/CALDataWrite.go |    6 +-
 .../knxnetip/readwrite/model/KnxDatapoint.go       |   23 +
 .../knxnetip/readwrite/model/KnxDatapointType.go   | 1176 ++++++++++----------
 .../knxnetip/readwrite/model/KnxManufacturer.go    |   32 +-
 .../abeth/readwrite/CIPEncapsulationPacket.java    |    5 +-
 .../readwrite/CIPEncapsulationReadRequest.java     |    1 -
 .../readwrite/CIPEncapsulationReadResponse.java    |   17 +-
 .../abeth/readwrite/DF1CommandRequestMessage.java  |    1 -
 ...ndResponseMessageProtectedTypedLogicalRead.java |   30 +-
 .../java/abeth/readwrite/DF1RequestMessage.java    |    8 +-
 .../DF1RequestProtectedTypedLogicalRead.java       |    1 -
 .../java/abeth/readwrite/DF1ResponseMessage.java   |   33 +-
 .../readwrite/AdsDiscoveryBlockAmsNetId.java       |    1 -
 .../readwrite/AdsDiscoveryBlockFingerprint.java    |    1 -
 .../readwrite/AdsDiscoveryBlockHostName.java       |    1 -
 .../readwrite/AdsDiscoveryBlockOsData.java         |    1 -
 .../readwrite/AdsDiscoveryBlockPassword.java       |    1 -
 .../readwrite/AdsDiscoveryBlockRouteName.java      |    1 -
 .../readwrite/AdsDiscoveryBlockStatus.java         |    1 -
 .../readwrite/AdsDiscoveryBlockUserName.java       |    1 -
 .../readwrite/AdsDiscoveryBlockVersion.java        |    1 -
 .../java/ads/discovery/readwrite/AmsString.java    |    8 +-
 .../readwrite/AdsAddDeviceNotificationRequest.java |   30 +-
 .../AdsAddDeviceNotificationResponse.java          |    1 -
 .../AdsDeleteDeviceNotificationRequest.java        |    1 -
 .../AdsDeleteDeviceNotificationResponse.java       |    1 -
 .../readwrite/AdsDeviceNotificationRequest.java    |    1 -
 .../ads/readwrite/AdsMultiRequestItemRead.java     |    1 -
 .../readwrite/AdsMultiRequestItemReadWrite.java    |    1 -
 .../ads/readwrite/AdsMultiRequestItemWrite.java    |    1 -
 .../ads/readwrite/AdsReadDeviceInfoResponse.java   |    1 -
 .../plc4x/java/ads/readwrite/AdsReadRequest.java   |    1 -
 .../plc4x/java/ads/readwrite/AdsReadResponse.java  |    1 -
 .../java/ads/readwrite/AdsReadStateResponse.java   |    1 -
 .../java/ads/readwrite/AdsReadWriteRequest.java    |    1 -
 .../java/ads/readwrite/AdsReadWriteResponse.java   |    1 -
 .../java/ads/readwrite/AdsSymbolTableEntry.java    |    9 +-
 .../java/ads/readwrite/AdsWriteControlRequest.java |    1 -
 .../ads/readwrite/AdsWriteControlResponse.java     |    1 -
 .../plc4x/java/ads/readwrite/AdsWriteRequest.java  |    1 -
 .../plc4x/java/ads/readwrite/AdsWriteResponse.java |    1 -
 .../apache/plc4x/java/ads/readwrite/AmsPacket.java |    8 +-
 .../plc4x/java/ads/readwrite/AmsTCPPacket.java     |    5 +-
 plc4j/drivers/bacnet/pom.xml                       |    5 +
 .../plc4x/java/bacnetip/readwrite/APDUUnknown.java |    1 -
 .../readwrite/BACnetApplicationTagBitString.java   |    1 -
 .../readwrite/BACnetApplicationTagBoolean.java     |    1 -
 .../BACnetApplicationTagCharacterString.java       |    1 -
 .../readwrite/BACnetApplicationTagDate.java        |    1 -
 .../readwrite/BACnetApplicationTagDouble.java      |    1 -
 .../readwrite/BACnetApplicationTagEnumerated.java  |    1 -
 .../BACnetApplicationTagObjectIdentifier.java      |    1 -
 .../readwrite/BACnetApplicationTagOctetString.java |    1 -
 .../readwrite/BACnetApplicationTagReal.java        |    1 -
 .../BACnetApplicationTagSignedInteger.java         |    1 -
 .../readwrite/BACnetApplicationTagTime.java        |    1 -
 .../BACnetApplicationTagUnsignedInteger.java       |    1 -
 .../readwrite/BACnetCalendarEntryDate.java         |    1 -
 .../readwrite/BACnetCalendarEntryDateRange.java    |    1 -
 .../readwrite/BACnetCalendarEntryWeekNDay.java     |    1 -
 .../readwrite/BACnetChannelValueBitString.java     |    1 -
 .../readwrite/BACnetChannelValueBoolean.java       |    1 -
 .../BACnetChannelValueCharacterString.java         |    1 -
 .../bacnetip/readwrite/BACnetChannelValueDate.java |    1 -
 .../readwrite/BACnetChannelValueDouble.java        |    1 -
 .../readwrite/BACnetChannelValueEnumerated.java    |    1 -
 .../readwrite/BACnetChannelValueInteger.java       |    1 -
 .../BACnetChannelValueLightingCommand.java         |    1 -
 .../bacnetip/readwrite/BACnetChannelValueNull.java |    1 -
 .../BACnetChannelValueObjectidentifier.java        |    1 -
 .../readwrite/BACnetChannelValueOctetString.java   |    1 -
 .../bacnetip/readwrite/BACnetChannelValueReal.java |    1 -
 .../bacnetip/readwrite/BACnetChannelValueTime.java |    1 -
 .../readwrite/BACnetChannelValueUnsigned.java      |    1 -
 .../bacnetip/readwrite/BACnetClientCOVNone.java    |    1 -
 .../bacnetip/readwrite/BACnetClientCOVObject.java  |    1 -
 .../readwrite/BACnetConfirmedServiceRequest.java   |   14 +-
 ...netConfirmedServiceRequestAcknowledgeAlarm.java |    1 -
 ...ACnetConfirmedServiceRequestAddListElement.java |    1 -
 ...ACnetConfirmedServiceRequestAtomicReadFile.java |    1 -
 ...onfirmedServiceRequestAtomicReadFileRecord.java |    1 -
 ...onfirmedServiceRequestAtomicReadFileStream.java |    1 -
 ...CnetConfirmedServiceRequestAtomicWriteFile.java |    1 -
 .../BACnetConfirmedServiceRequestAuthenticate.java |   19 +-
 ...rmedServiceRequestConfirmedCOVNotification.java |    1 -
 ...iceRequestConfirmedCOVNotificationMultiple.java |    1 -
 ...edServiceRequestConfirmedEventNotification.java |    1 -
 ...rmedServiceRequestConfirmedPrivateTransfer.java |    1 -
 ...onfirmedServiceRequestConfirmedTextMessage.java |    1 -
 ...tConfirmedTextMessageMessageClassCharacter.java |    1 -
 ...estConfirmedTextMessageMessageClassNumeric.java |    1 -
 .../BACnetConfirmedServiceRequestCreateObject.java |    1 -
 .../BACnetConfirmedServiceRequestDeleteObject.java |    1 -
 ...edServiceRequestDeviceCommunicationControl.java |    1 -
 ...onfirmedServiceRequestGetEnrollmentSummary.java |    1 -
 ...ConfirmedServiceRequestGetEventInformation.java |    1 -
 ...ConfirmedServiceRequestLifeSafetyOperation.java |    1 -
 .../BACnetConfirmedServiceRequestReadProperty.java |    1 -
 ...irmedServiceRequestReadPropertyConditional.java |   19 +-
 ...onfirmedServiceRequestReadPropertyMultiple.java |   23 +-
 .../BACnetConfirmedServiceRequestReadRange.java    |    1 -
 ...rmedServiceRequestReadRangeRangeByPosition.java |    1 -
 ...rviceRequestReadRangeRangeBySequenceNumber.java |    1 -
 ...onfirmedServiceRequestReadRangeRangeByTime.java |    1 -
 ...tConfirmedServiceRequestReinitializeDevice.java |    1 -
 ...etConfirmedServiceRequestRemoveListElement.java |    1 -
 .../BACnetConfirmedServiceRequestRequestKey.java   |   19 +-
 .../BACnetConfirmedServiceRequestSubscribeCOV.java |    1 -
 ...onfirmedServiceRequestSubscribeCOVProperty.java |    1 -
 ...ServiceRequestSubscribeCOVPropertyMultiple.java |    1 -
 .../BACnetConfirmedServiceRequestUnknown.java      |   19 +-
 .../BACnetConfirmedServiceRequestVTClose.java      |   23 +-
 .../BACnetConfirmedServiceRequestVTData.java       |    1 -
 .../BACnetConfirmedServiceRequestVTOpen.java       |    1 -
 ...BACnetConfirmedServiceRequestWriteProperty.java |    1 -
 ...nfirmedServiceRequestWritePropertyMultiple.java |   23 +-
 .../readwrite/BACnetConstructedDataAPDULength.java |    1 -
 .../BACnetConstructedDataAPDUSegmentTimeout.java   |    1 -
 .../BACnetConstructedDataAPDUTimeout.java          |    1 -
 .../BACnetConstructedDataAbsenteeLimit.java        |    1 -
 .../BACnetConstructedDataAcceptedModes.java        |    1 -
 .../BACnetConstructedDataAccessAlarmEvents.java    |    1 -
 .../BACnetConstructedDataAccessCredentialAll.java  |    1 -
 ...BACnetConstructedDataAccessDoorAlarmValues.java |    1 -
 .../BACnetConstructedDataAccessDoorAll.java        |    1 -
 ...BACnetConstructedDataAccessDoorFaultValues.java |    1 -
 ...ACnetConstructedDataAccessDoorPresentValue.java |    1 -
 ...ConstructedDataAccessDoorRelinquishDefault.java |    1 -
 .../BACnetConstructedDataAccessDoors.java          |    1 -
 .../BACnetConstructedDataAccessEvent.java          |    1 -
 ...tructedDataAccessEventAuthenticationFactor.java |    1 -
 ...BACnetConstructedDataAccessEventCredential.java |    1 -
 .../BACnetConstructedDataAccessEventTag.java       |    1 -
 .../BACnetConstructedDataAccessEventTime.java      |    1 -
 .../BACnetConstructedDataAccessPointAll.java       |    1 -
 .../BACnetConstructedDataAccessRightsAll.java      |    1 -
 ...CnetConstructedDataAccessTransactionEvents.java |    1 -
 .../BACnetConstructedDataAccessUserAll.java        |    1 -
 ...BACnetConstructedDataAccessZoneAdjustValue.java |    1 -
 ...BACnetConstructedDataAccessZoneAlarmValues.java |    1 -
 .../BACnetConstructedDataAccessZoneAll.java        |    1 -
 .../BACnetConstructedDataAccompaniment.java        |    1 -
 .../BACnetConstructedDataAccompanimentTime.java    |    1 -
 .../BACnetConstructedDataAccumulatorAll.java       |    1 -
 ...etConstructedDataAccumulatorFaultHighLimit.java |    1 -
 ...netConstructedDataAccumulatorFaultLowLimit.java |    1 -
 .../BACnetConstructedDataAccumulatorHighLimit.java |    1 -
 .../BACnetConstructedDataAccumulatorLowLimit.java  |    1 -
 ...CnetConstructedDataAccumulatorMaxPresValue.java |    1 -
 ...CnetConstructedDataAccumulatorMinPresValue.java |    1 -
 .../BACnetConstructedDataAckRequired.java          |    1 -
 .../BACnetConstructedDataAckedTransitions.java     |    1 -
 .../readwrite/BACnetConstructedDataAction.java     |    1 -
 .../readwrite/BACnetConstructedDataActionText.java |    1 -
 .../BACnetConstructedDataActivationTime.java       |    1 -
 ...tConstructedDataActiveAuthenticationPolicy.java |    1 -
 ...structedDataActiveCOVMultipleSubscriptions.java |    1 -
 ...ACnetConstructedDataActiveCOVSubscriptions.java |    1 -
 .../readwrite/BACnetConstructedDataActiveText.java |    1 -
 .../BACnetConstructedDataActiveVTSessions.java     |    1 -
 .../BACnetConstructedDataActualShedLevel.java      |    1 -
 .../BACnetConstructedDataAdjustValue.java          |    1 -
 .../readwrite/BACnetConstructedDataAlarmValue.java |    1 -
 .../BACnetConstructedDataAlarmValues.java          |    1 -
 .../BACnetConstructedDataAlertEnrollmentAll.java   |    1 -
 ...ConstructedDataAlertEnrollmentPresentValue.java |    1 -
 .../BACnetConstructedDataAlignIntervals.java       |    1 -
 .../BACnetConstructedDataAllWritesSuccessful.java  |    1 -
 ...ACnetConstructedDataAllowGroupDelayInhibit.java |    1 -
 .../BACnetConstructedDataAnalogInputAll.java       |    1 -
 ...etConstructedDataAnalogInputFaultHighLimit.java |    1 -
 ...netConstructedDataAnalogInputFaultLowLimit.java |    1 -
 ...etConstructedDataAnalogInputInterfaceValue.java |    1 -
 ...CnetConstructedDataAnalogInputMaxPresValue.java |    1 -
 ...CnetConstructedDataAnalogInputPresentValue.java |    1 -
 .../BACnetConstructedDataAnalogOutputAll.java      |    1 -
 ...tConstructedDataAnalogOutputInterfaceValue.java |    1 -
 ...netConstructedDataAnalogOutputMaxPresValue.java |    1 -
 ...netConstructedDataAnalogOutputPresentValue.java |    1 -
 ...nstructedDataAnalogOutputRelinquishDefault.java |    1 -
 .../BACnetConstructedDataAnalogValueAll.java       |    1 -
 ...etConstructedDataAnalogValueFaultHighLimit.java |    1 -
 ...netConstructedDataAnalogValueFaultLowLimit.java |    1 -
 ...CnetConstructedDataAnalogValueMaxPresValue.java |    1 -
 ...CnetConstructedDataAnalogValuePresentValue.java |    1 -
 ...onstructedDataAnalogValueRelinquishDefault.java |    1 -
 ...tConstructedDataApplicationSoftwareVersion.java |    1 -
 .../readwrite/BACnetConstructedDataArchive.java    |    1 -
 .../BACnetConstructedDataAssignedAccessRights.java |    1 -
 .../BACnetConstructedDataAssignedLandingCalls.java |    1 -
 .../BACnetConstructedDataAttemptedSamples.java     |    1 -
 ...BACnetConstructedDataAuthenticationFactors.java |    1 -
 ...netConstructedDataAuthenticationPolicyList.java |    1 -
 ...etConstructedDataAuthenticationPolicyNames.java |    1 -
 .../BACnetConstructedDataAuthenticationStatus.java |    1 -
 ...CnetConstructedDataAuthorizationExemptions.java |    1 -
 .../BACnetConstructedDataAuthorizationMode.java    |    1 -
 .../BACnetConstructedDataAutoSlaveDiscovery.java   |    1 -
 .../BACnetConstructedDataAverageValue.java         |    1 -
 .../BACnetConstructedDataAveragingAll.java         |    1 -
 ...BACnetConstructedDataBACnetIPGlobalAddress.java |    1 -
 .../BACnetConstructedDataBACnetIPMode.java         |    1 -
 ...netConstructedDataBACnetIPMulticastAddress.java |    1 -
 .../BACnetConstructedDataBACnetIPNATTraversal.java |    1 -
 .../BACnetConstructedDataBACnetIPUDPPort.java      |    1 -
 .../BACnetConstructedDataBACnetIPv6Mode.java       |    1 -
 ...tConstructedDataBACnetIPv6MulticastAddress.java |    1 -
 .../BACnetConstructedDataBACnetIPv6UDPPort.java    |    1 -
 ...etConstructedDataBBMDAcceptFDRegistrations.java |    1 -
 ...structedDataBBMDBroadcastDistributionTable.java |    1 -
 ...ACnetConstructedDataBBMDForeignDeviceTable.java |    1 -
 ...BACnetConstructedDataBackupAndRestoreState.java |    1 -
 .../BACnetConstructedDataBackupFailureTimeout.java |    1 -
 ...BACnetConstructedDataBackupPreparationTime.java |    1 -
 ...netConstructedDataBaseDeviceSecurityPolicy.java |    1 -
 .../readwrite/BACnetConstructedDataBelongsTo.java  |    1 -
 .../readwrite/BACnetConstructedDataBias.java       |    1 -
 .../BACnetConstructedDataBinaryInputAll.java       |    1 -
 ...etConstructedDataBinaryInputInterfaceValue.java |    1 -
 ...CnetConstructedDataBinaryInputPresentValue.java |    1 -
 ...CnetConstructedDataBinaryLightingOutputAll.java |    1 -
 ...uctedDataBinaryLightingOutputFeedbackValue.java |    1 -
 ...ructedDataBinaryLightingOutputPresentValue.java |    1 -
 ...dDataBinaryLightingOutputRelinquishDefault.java |    1 -
 .../BACnetConstructedDataBinaryOutputAll.java      |    1 -
 ...etConstructedDataBinaryOutputFeedbackValue.java |    1 -
 ...tConstructedDataBinaryOutputInterfaceValue.java |    1 -
 ...netConstructedDataBinaryOutputPresentValue.java |    1 -
 ...nstructedDataBinaryOutputRelinquishDefault.java |    1 -
 .../BACnetConstructedDataBinaryValueAll.java       |    1 -
 ...CnetConstructedDataBinaryValuePresentValue.java |    1 -
 ...onstructedDataBinaryValueRelinquishDefault.java |    1 -
 .../readwrite/BACnetConstructedDataBitMask.java    |    1 -
 ...etConstructedDataBitStringValueAlarmValues.java |    1 -
 ...tConstructedDataBitStringValuePresentValue.java |    1 -
 ...tructedDataBitStringValueRelinquishDefault.java |    1 -
 .../readwrite/BACnetConstructedDataBitText.java    |    1 -
 .../BACnetConstructedDataBitstringValueAll.java    |    1 -
 .../BACnetConstructedDataBlinkWarnEnable.java      |    1 -
 .../readwrite/BACnetConstructedDataBufferSize.java |    1 -
 .../BACnetConstructedDataCOVIncrement.java         |    1 -
 .../readwrite/BACnetConstructedDataCOVPeriod.java  |    1 -
 ...etConstructedDataCOVResubscriptionInterval.java |    1 -
 .../readwrite/BACnetConstructedDataCOVUPeriod.java |    1 -
 .../BACnetConstructedDataCOVURecipients.java       |    1 -
 .../BACnetConstructedDataCalendarAll.java          |    1 -
 .../BACnetConstructedDataCalendarPresentValue.java |    1 -
 .../BACnetConstructedDataCarAssignedDirection.java |    1 -
 .../BACnetConstructedDataCarDoorCommand.java       |    1 -
 .../BACnetConstructedDataCarDoorStatus.java        |    1 -
 .../BACnetConstructedDataCarDoorText.java          |    1 -
 .../BACnetConstructedDataCarDoorZone.java          |    1 -
 .../BACnetConstructedDataCarDriveStatus.java       |    1 -
 .../readwrite/BACnetConstructedDataCarLoad.java    |    1 -
 .../BACnetConstructedDataCarLoadUnits.java         |    1 -
 .../readwrite/BACnetConstructedDataCarMode.java    |    1 -
 .../BACnetConstructedDataCarMovingDirection.java   |    1 -
 .../BACnetConstructedDataCarPosition.java          |    1 -
 .../BACnetConstructedDataChangeOfStateCount.java   |    1 -
 .../BACnetConstructedDataChangeOfStateTime.java    |    1 -
 .../BACnetConstructedDataChangesPending.java       |    1 -
 .../readwrite/BACnetConstructedDataChannelAll.java |    1 -
 ...dDataChannelListOfObjectPropertyReferences.java |    1 -
 .../BACnetConstructedDataChannelNumber.java        |    1 -
 .../BACnetConstructedDataChannelPresentValue.java  |    1 -
 ...tructedDataCharacterStringValueAlarmValues.java |    1 -
 ...tructedDataCharacterStringValueFaultValues.java |    1 -
 ...ructedDataCharacterStringValuePresentValue.java |    1 -
 ...dDataCharacterStringValueRelinquishDefault.java |    1 -
 ...CnetConstructedDataCharacterstringValueAll.java |    1 -
 .../BACnetConstructedDataClientCOVIncrement.java   |    1 -
 .../readwrite/BACnetConstructedDataCommand.java    |    1 -
 .../BACnetConstructedDataCommandAction.java        |    1 -
 .../readwrite/BACnetConstructedDataCommandAll.java |    1 -
 .../BACnetConstructedDataCommandTimeArray.java     |    1 -
 .../BACnetConstructedDataConfigurationFiles.java   |    1 -
 .../BACnetConstructedDataControlGroups.java        |    1 -
 ...ConstructedDataControlledVariableReference.java |    1 -
 ...CnetConstructedDataControlledVariableUnits.java |    1 -
 ...CnetConstructedDataControlledVariableValue.java |    1 -
 .../readwrite/BACnetConstructedDataCount.java      |    1 -
 .../BACnetConstructedDataCountBeforeChange.java    |    1 -
 .../BACnetConstructedDataCountChangeTime.java      |    1 -
 ...ACnetConstructedDataCredentialDataInputAll.java |    1 -
 ...tructedDataCredentialDataInputPresentValue.java |    1 -
 ...nstructedDataCredentialDataInputUpdateTime.java |    1 -
 .../BACnetConstructedDataCredentialDisable.java    |    1 -
 .../BACnetConstructedDataCredentialStatus.java     |    1 -
 .../BACnetConstructedDataCredentials.java          |    1 -
 .../BACnetConstructedDataCredentialsInZone.java    |    1 -
 ...ACnetConstructedDataCurrentCommandPriority.java |    1 -
 .../BACnetConstructedDataDatabaseRevision.java     |    1 -
 .../readwrite/BACnetConstructedDataDateList.java   |    1 -
 ...onstructedDataDatePatternValuePresentValue.java |    1 -
 ...uctedDataDatePatternValueRelinquishDefault.java |    1 -
 ...ructedDataDateTimePatternValuePresentValue.java |    1 -
 ...dDataDateTimePatternValueRelinquishDefault.java |    1 -
 ...etConstructedDataDateTimeValuePresentValue.java |    1 -
 ...structedDataDateTimeValueRelinquishDefault.java |    1 -
 .../BACnetConstructedDataDateValueAll.java         |    1 -
 ...BACnetConstructedDataDateValuePresentValue.java |    1 -
 ...tConstructedDataDateValueRelinquishDefault.java |    1 -
 .../BACnetConstructedDataDatepatternValueAll.java  |    1 -
 .../BACnetConstructedDataDatetimeValueAll.java     |    1 -
 ...CnetConstructedDataDatetimepatternValueAll.java |    1 -
 ...BACnetConstructedDataDaylightSavingsStatus.java |    1 -
 .../BACnetConstructedDataDaysRemaining.java        |    1 -
 .../readwrite/BACnetConstructedDataDeadband.java   |    1 -
 .../BACnetConstructedDataDefaultFadeTime.java      |    1 -
 .../BACnetConstructedDataDefaultRampRate.java      |    1 -
 .../BACnetConstructedDataDefaultStepIncrement.java |    1 -
 ...structedDataDefaultSubordinateRelationship.java |    1 -
 .../BACnetConstructedDataDefaultTimeout.java       |    1 -
 ...CnetConstructedDataDeployedProfileLocation.java |    1 -
 .../BACnetConstructedDataDerivativeConstant.java   |    1 -
 ...CnetConstructedDataDerivativeConstantUnits.java |    1 -
 .../BACnetConstructedDataDescription.java          |    1 -
 .../BACnetConstructedDataDescriptionOfHalt.java    |    1 -
 .../BACnetConstructedDataDeviceAddressBinding.java |    1 -
 .../readwrite/BACnetConstructedDataDeviceAll.java  |    1 -
 .../BACnetConstructedDataDeviceMaxInfoFrames.java  |    1 -
 .../BACnetConstructedDataDeviceMaxMaster.java      |    1 -
 .../readwrite/BACnetConstructedDataDeviceType.java |    1 -
 .../BACnetConstructedDataDirectReading.java        |    1 -
 ...CnetConstructedDataDistributionKeyRevision.java |    1 -
 .../readwrite/BACnetConstructedDataDoNotHide.java  |    1 -
 .../BACnetConstructedDataDoorAlarmState.java       |    1 -
 ...BACnetConstructedDataDoorExtendedPulseTime.java |    1 -
 .../BACnetConstructedDataDoorMembers.java          |    1 -
 .../BACnetConstructedDataDoorOpenTooLongTime.java  |    1 -
 .../BACnetConstructedDataDoorPulseTime.java        |    1 -
 .../readwrite/BACnetConstructedDataDoorStatus.java |    1 -
 .../BACnetConstructedDataDoorUnlockDelayTime.java  |    1 -
 .../readwrite/BACnetConstructedDataDutyWindow.java |    1 -
 .../BACnetConstructedDataEffectivePeriod.java      |    1 -
 .../BACnetConstructedDataEgressActive.java         |    1 -
 .../readwrite/BACnetConstructedDataEgressTime.java |    1 -
 .../BACnetConstructedDataElapsedActiveTime.java    |    1 -
 .../BACnetConstructedDataElevatorGroup.java        |    1 -
 .../BACnetConstructedDataElevatorGroupAll.java     |    1 -
 ...etConstructedDataElevatorGroupGroupMembers.java |    1 -
 .../readwrite/BACnetConstructedDataEnable.java     |    1 -
 .../BACnetConstructedDataEnergyMeter.java          |    1 -
 .../BACnetConstructedDataEnergyMeterRef.java       |    1 -
 .../BACnetConstructedDataEntryPoints.java          |    1 -
 .../readwrite/BACnetConstructedDataErrorLimit.java |    1 -
 .../BACnetConstructedDataEscalatorAll.java         |    1 -
 ...BACnetConstructedDataEscalatorFaultSignals.java |    1 -
 .../BACnetConstructedDataEscalatorMode.java        |    1 -
 ...BACnetConstructedDataEventAlgorithmInhibit.java |    1 -
 ...netConstructedDataEventAlgorithmInhibitRef.java |    1 -
 .../BACnetConstructedDataEventDetectionEnable.java |    1 -
 .../BACnetConstructedDataEventEnable.java          |    1 -
 .../BACnetConstructedDataEventEnrollmentAll.java   |    1 -
 .../BACnetConstructedDataEventLogAll.java          |    1 -
 .../BACnetConstructedDataEventLogLogBuffer.java    |    1 -
 .../BACnetConstructedDataEventMessageTexts.java    |    1 -
 ...CnetConstructedDataEventMessageTextsConfig.java |    1 -
 .../BACnetConstructedDataEventParameters.java      |    1 -
 .../readwrite/BACnetConstructedDataEventState.java |    1 -
 .../BACnetConstructedDataEventTimeStamps.java      |    1 -
 .../readwrite/BACnetConstructedDataEventType.java  |    1 -
 .../BACnetConstructedDataExceptionSchedule.java    |    1 -
 .../BACnetConstructedDataExecutionDelay.java       |    1 -
 .../readwrite/BACnetConstructedDataExitPoints.java |    1 -
 .../BACnetConstructedDataExpectedShedLevel.java    |    1 -
 .../BACnetConstructedDataExpirationTime.java       |    1 -
 .../BACnetConstructedDataExtendedTimeEnable.java   |    1 -
 .../BACnetConstructedDataFDBBMDAddress.java        |    1 -
 ...ACnetConstructedDataFDSubscriptionLifetime.java |    1 -
 .../BACnetConstructedDataFailedAttemptEvents.java  |    1 -
 .../BACnetConstructedDataFailedAttempts.java       |    1 -
 .../BACnetConstructedDataFailedAttemptsTime.java   |    1 -
 .../BACnetConstructedDataFaultHighLimit.java       |    1 -
 .../BACnetConstructedDataFaultLowLimit.java        |    1 -
 .../BACnetConstructedDataFaultParameters.java      |    1 -
 .../BACnetConstructedDataFaultSignals.java         |    1 -
 .../readwrite/BACnetConstructedDataFaultType.java  |    1 -
 .../BACnetConstructedDataFaultValues.java          |    1 -
 .../BACnetConstructedDataFileAccessMethod.java     |    1 -
 .../readwrite/BACnetConstructedDataFileAll.java    |    1 -
 .../BACnetConstructedDataFileRecordCount.java      |    1 -
 .../readwrite/BACnetConstructedDataFileSize.java   |    1 -
 .../readwrite/BACnetConstructedDataFileType.java   |    1 -
 .../BACnetConstructedDataFirmwareRevision.java     |    1 -
 .../readwrite/BACnetConstructedDataFloorText.java  |    1 -
 .../BACnetConstructedDataFullDutyBaseline.java     |    1 -
 .../BACnetConstructedDataGlobalGroupAll.java       |    1 -
 ...CnetConstructedDataGlobalGroupGroupMembers.java |    1 -
 ...CnetConstructedDataGlobalGroupPresentValue.java |    1 -
 .../BACnetConstructedDataGlobalIdentifier.java     |    1 -
 .../readwrite/BACnetConstructedDataGroupAll.java   |    1 -
 .../readwrite/BACnetConstructedDataGroupID.java    |    1 -
 .../BACnetConstructedDataGroupMemberNames.java     |    1 -
 .../BACnetConstructedDataGroupMembers.java         |    1 -
 .../readwrite/BACnetConstructedDataGroupMode.java  |    1 -
 .../BACnetConstructedDataGroupPresentValue.java    |    1 -
 .../readwrite/BACnetConstructedDataHighLimit.java  |    1 -
 .../readwrite/BACnetConstructedDataHigherDeck.java |    1 -
 .../readwrite/BACnetConstructedDataIPAddress.java  |    1 -
 .../BACnetConstructedDataIPDHCPEnable.java         |    1 -
 .../BACnetConstructedDataIPDHCPLeaseTime.java      |    1 -
 ...netConstructedDataIPDHCPLeaseTimeRemaining.java |    1 -
 .../BACnetConstructedDataIPDHCPServer.java         |    1 -
 .../BACnetConstructedDataIPDNSServer.java          |    1 -
 .../BACnetConstructedDataIPDefaultGateway.java     |    1 -
 .../BACnetConstructedDataIPSubnetMask.java         |    1 -
 .../BACnetConstructedDataIPv6Address.java          |    1 -
 ...netConstructedDataIPv6AutoAddressingEnable.java |    1 -
 .../BACnetConstructedDataIPv6DHCPLeaseTime.java    |    1 -
 ...tConstructedDataIPv6DHCPLeaseTimeRemaining.java |    1 -
 .../BACnetConstructedDataIPv6DHCPServer.java       |    1 -
 .../BACnetConstructedDataIPv6DNSServer.java        |    1 -
 .../BACnetConstructedDataIPv6DefaultGateway.java   |    1 -
 .../BACnetConstructedDataIPv6PrefixLength.java     |    1 -
 .../BACnetConstructedDataIPv6ZoneIndex.java        |    1 -
 .../readwrite/BACnetConstructedDataInProcess.java  |    1 -
 .../readwrite/BACnetConstructedDataInProgress.java |    1 -
 .../BACnetConstructedDataInactiveText.java         |    1 -
 .../BACnetConstructedDataInitialTimeout.java       |    1 -
 .../BACnetConstructedDataInputReference.java       |    1 -
 .../BACnetConstructedDataInstallationID.java       |    1 -
 .../readwrite/BACnetConstructedDataInstanceOf.java |    1 -
 .../BACnetConstructedDataInstantaneousPower.java   |    1 -
 .../BACnetConstructedDataIntegerValueAll.java      |    1 -
 ...netConstructedDataIntegerValueCOVIncrement.java |    1 -
 .../BACnetConstructedDataIntegerValueDeadband.java |    1 -
 ...tConstructedDataIntegerValueFaultHighLimit.java |    1 -
 ...etConstructedDataIntegerValueFaultLowLimit.java |    1 -
 ...BACnetConstructedDataIntegerValueHighLimit.java |    1 -
 .../BACnetConstructedDataIntegerValueLowLimit.java |    1 -
 ...netConstructedDataIntegerValueMaxPresValue.java |    1 -
 ...netConstructedDataIntegerValueMinPresValue.java |    1 -
 ...netConstructedDataIntegerValuePresentValue.java |    1 -
 ...nstructedDataIntegerValueRelinquishDefault.java |    1 -
 ...ACnetConstructedDataIntegerValueResolution.java |    1 -
 .../BACnetConstructedDataIntegralConstant.java     |    1 -
 ...BACnetConstructedDataIntegralConstantUnits.java |    1 -
 .../BACnetConstructedDataIntervalOffset.java       |    1 -
 .../readwrite/BACnetConstructedDataIsUTC.java      |    1 -
 .../readwrite/BACnetConstructedDataKeySets.java    |    1 -
 .../BACnetConstructedDataLandingCallControl.java   |    1 -
 .../BACnetConstructedDataLandingCalls.java         |    1 -
 .../BACnetConstructedDataLandingDoorStatus.java    |    1 -
 .../BACnetConstructedDataLargeAnalogValueAll.java  |    1 -
 ...onstructedDataLargeAnalogValueCOVIncrement.java |    1 -
 ...netConstructedDataLargeAnalogValueDeadband.java |    1 -
 ...structedDataLargeAnalogValueFaultHighLimit.java |    1 -
 ...nstructedDataLargeAnalogValueFaultLowLimit.java |    1 -
 ...etConstructedDataLargeAnalogValueHighLimit.java |    1 -
 ...netConstructedDataLargeAnalogValueLowLimit.java |    1 -
 ...onstructedDataLargeAnalogValueMaxPresValue.java |    1 -
 ...onstructedDataLargeAnalogValueMinPresValue.java |    1 -
 ...onstructedDataLargeAnalogValuePresentValue.java |    1 -
 ...uctedDataLargeAnalogValueRelinquishDefault.java |    1 -
 ...tConstructedDataLargeAnalogValueResolution.java |    1 -
 .../BACnetConstructedDataLastAccessEvent.java      |    1 -
 .../BACnetConstructedDataLastAccessPoint.java      |    1 -
 .../BACnetConstructedDataLastCommandTime.java      |    1 -
 .../BACnetConstructedDataLastCredentialAdded.java  |    1 -
 ...CnetConstructedDataLastCredentialAddedTime.java |    1 -
 ...BACnetConstructedDataLastCredentialRemoved.java |    1 -
 ...etConstructedDataLastCredentialRemovedTime.java |    1 -
 .../BACnetConstructedDataLastKeyServer.java        |    1 -
 .../BACnetConstructedDataLastNotifyRecord.java     |    1 -
 .../BACnetConstructedDataLastPriority.java         |    1 -
 .../BACnetConstructedDataLastRestartReason.java    |    1 -
 .../BACnetConstructedDataLastRestoreTime.java      |    1 -
 .../BACnetConstructedDataLastStateChange.java      |    1 -
 .../BACnetConstructedDataLastUseTime.java          |    1 -
 ...BACnetConstructedDataLifeSafetyAlarmValues.java |    1 -
 ...tConstructedDataLifeSafetyPointAlarmValues.java |    1 -
 .../BACnetConstructedDataLifeSafetyPointAll.java   |    1 -
 ...tConstructedDataLifeSafetyPointFaultValues.java |    1 -
 ...ConstructedDataLifeSafetyPointPresentValue.java |    1 -
 ...etConstructedDataLifeSafetyZoneAlarmValues.java |    1 -
 .../BACnetConstructedDataLifeSafetyZoneAll.java    |    1 -
 ...etConstructedDataLifeSafetyZoneFaultValues.java |    1 -
 ...uctedDataLifeSafetyZoneMaintenanceRequired.java |    1 -
 ...tConstructedDataLifeSafetyZonePresentValue.java |    1 -
 .../readwrite/BACnetConstructedDataLiftAll.java    |    1 -
 .../BACnetConstructedDataLiftFaultSignals.java     |    1 -
 .../BACnetConstructedDataLightingCommand.java      |    1 -
 ...structedDataLightingCommandDefaultPriority.java |    1 -
 .../BACnetConstructedDataLightingOutputAll.java    |    1 -
 ...ConstructedDataLightingOutputFeedbackValue.java |    1 -
 ...tConstructedDataLightingOutputPresentValue.java |    1 -
 ...tructedDataLightingOutputRelinquishDefault.java |    1 -
 ...ConstructedDataLightingOutputTrackingValue.java |    1 -
 .../BACnetConstructedDataLimitEnable.java          |    1 -
 ...CnetConstructedDataLimitMonitoringInterval.java |    1 -
 .../readwrite/BACnetConstructedDataLinkSpeed.java  |    1 -
 ...ACnetConstructedDataLinkSpeedAutonegotiate.java |    1 -
 .../readwrite/BACnetConstructedDataLinkSpeeds.java |    1 -
 .../BACnetConstructedDataListOfGroupMembers.java   |    1 -
 ...structedDataListOfObjectPropertyReferences.java |    1 -
 .../BACnetConstructedDataLoadControlAll.java       |    1 -
 ...CnetConstructedDataLoadControlPresentValue.java |    1 -
 .../readwrite/BACnetConstructedDataLocalDate.java  |    1 -
 .../BACnetConstructedDataLocalForwardingOnly.java  |    1 -
 .../readwrite/BACnetConstructedDataLocalTime.java  |    1 -
 .../readwrite/BACnetConstructedDataLocation.java   |    1 -
 .../readwrite/BACnetConstructedDataLockStatus.java |    1 -
 .../readwrite/BACnetConstructedDataLockout.java    |    1 -
 ...BACnetConstructedDataLockoutRelinquishTime.java |    1 -
 .../readwrite/BACnetConstructedDataLogBuffer.java  |    1 -
 ...CnetConstructedDataLogDeviceObjectProperty.java |    1 -
 .../BACnetConstructedDataLogInterval.java          |    1 -
 .../BACnetConstructedDataLoggingObject.java        |    1 -
 .../BACnetConstructedDataLoggingRecord.java        |    1 -
 .../BACnetConstructedDataLoggingType.java          |    1 -
 .../readwrite/BACnetConstructedDataLoopAction.java |    1 -
 .../readwrite/BACnetConstructedDataLoopAll.java    |    1 -
 .../BACnetConstructedDataLoopPresentValue.java     |    1 -
 .../BACnetConstructedDataLowDiffLimit.java         |    1 -
 .../readwrite/BACnetConstructedDataLowLimit.java   |    1 -
 .../readwrite/BACnetConstructedDataLowerDeck.java  |    1 -
 .../readwrite/BACnetConstructedDataMACAddress.java |    1 -
 .../BACnetConstructedDataMachineRoomID.java        |    1 -
 .../BACnetConstructedDataMaintenanceRequired.java  |    1 -
 .../BACnetConstructedDataMakingCarCall.java        |    1 -
 ...onstructedDataManipulatedVariableReference.java |    1 -
 ...etConstructedDataManualSlaveAddressBinding.java |    1 -
 .../BACnetConstructedDataMaskedAlarmValues.java    |    1 -
 ...BACnetConstructedDataMaxAPDULengthAccepted.java |    1 -
 .../BACnetConstructedDataMaxActualValue.java       |    1 -
 .../BACnetConstructedDataMaxFailedAttempts.java    |    1 -
 .../BACnetConstructedDataMaxInfoFrames.java        |    1 -
 .../readwrite/BACnetConstructedDataMaxMaster.java  |    1 -
 .../BACnetConstructedDataMaxPresValue.java         |    1 -
 .../BACnetConstructedDataMaxSegmentsAccepted.java  |    1 -
 .../BACnetConstructedDataMaximumOutput.java        |    1 -
 .../BACnetConstructedDataMaximumValue.java         |    1 -
 ...BACnetConstructedDataMaximumValueTimestamp.java |    1 -
 .../readwrite/BACnetConstructedDataMemberOf.java   |    1 -
 .../BACnetConstructedDataMemberStatusFlags.java    |    1 -
 .../readwrite/BACnetConstructedDataMembers.java    |    1 -
 .../BACnetConstructedDataMinActualValue.java       |    1 -
 .../BACnetConstructedDataMinPresValue.java         |    1 -
 .../BACnetConstructedDataMinimumOffTime.java       |    1 -
 .../BACnetConstructedDataMinimumOnTime.java        |    1 -
 .../BACnetConstructedDataMinimumOutput.java        |    1 -
 .../BACnetConstructedDataMinimumValue.java         |    1 -
 ...BACnetConstructedDataMinimumValueTimestamp.java |    1 -
 .../readwrite/BACnetConstructedDataMode.java       |    1 -
 .../readwrite/BACnetConstructedDataModelName.java  |    1 -
 .../BACnetConstructedDataModificationDate.java     |    1 -
 ...tConstructedDataMultiStateInputAlarmValues.java |    1 -
 .../BACnetConstructedDataMultiStateInputAll.java   |    1 -
 ...tConstructedDataMultiStateInputFaultValues.java |    1 -
 ...nstructedDataMultiStateInputInterfaceValue.java |    1 -
 .../BACnetConstructedDataMultiStateOutputAll.java  |    1 -
 ...nstructedDataMultiStateOutputFeedbackValue.java |    1 -
 ...structedDataMultiStateOutputInterfaceValue.java |    1 -
 ...uctedDataMultiStateOutputRelinquishDefault.java |    1 -
 ...tConstructedDataMultiStateValueAlarmValues.java |    1 -
 .../BACnetConstructedDataMultiStateValueAll.java   |    1 -
 ...tConstructedDataMultiStateValueFaultValues.java |    1 -
 ...ructedDataMultiStateValueRelinquishDefault.java |    1 -
 .../BACnetConstructedDataMusterPoint.java          |    1 -
 .../BACnetConstructedDataNegativeAccessRules.java  |    1 -
 ...nstructedDataNetworkAccessSecurityPolicies.java |    1 -
 .../BACnetConstructedDataNetworkInterfaceName.java |    1 -
 .../BACnetConstructedDataNetworkNumber.java        |    1 -
 .../BACnetConstructedDataNetworkNumberQuality.java |    1 -
 .../BACnetConstructedDataNetworkPortAll.java       |    1 -
 ...netConstructedDataNetworkPortMaxInfoFrames.java |    1 -
 .../BACnetConstructedDataNetworkPortMaxMaster.java |    1 -
 .../BACnetConstructedDataNetworkSecurityAll.java   |    1 -
 .../BACnetConstructedDataNetworkType.java          |    1 -
 .../BACnetConstructedDataNextStoppingFloor.java    |    1 -
 .../BACnetConstructedDataNodeSubtype.java          |    1 -
 .../readwrite/BACnetConstructedDataNodeType.java   |    1 -
 .../BACnetConstructedDataNotificationClass.java    |    1 -
 .../BACnetConstructedDataNotificationClassAll.java |    1 -
 ...netConstructedDataNotificationForwarderAll.java |    1 -
 ...BACnetConstructedDataNotificationThreshold.java |    1 -
 .../readwrite/BACnetConstructedDataNotifyType.java |    1 -
 .../BACnetConstructedDataNumberOfAPDURetries.java  |    1 -
 ...structedDataNumberOfAuthenticationPolicies.java |    1 -
 .../BACnetConstructedDataNumberOfStates.java       |    1 -
 .../BACnetConstructedDataObjectIdentifier.java     |    1 -
 .../readwrite/BACnetConstructedDataObjectList.java |    1 -
 .../readwrite/BACnetConstructedDataObjectName.java |    1 -
 ...CnetConstructedDataObjectPropertyReference.java |    1 -
 .../readwrite/BACnetConstructedDataObjectType.java |    1 -
 .../BACnetConstructedDataOccupancyCount.java       |    1 -
 .../BACnetConstructedDataOccupancyCountAdjust.java |    1 -
 .../BACnetConstructedDataOccupancyCountEnable.java |    1 -
 .../BACnetConstructedDataOccupancyLowerLimit.java  |    1 -
 ...ConstructedDataOccupancyLowerLimitEnforced.java |    1 -
 .../BACnetConstructedDataOccupancyState.java       |    1 -
 .../BACnetConstructedDataOccupancyUpperLimit.java  |    1 -
 ...ConstructedDataOccupancyUpperLimitEnforced.java |    1 -
 ...onstructedDataOctetStringValuePresentValue.java |    1 -
 ...uctedDataOctetStringValueRelinquishDefault.java |    1 -
 .../BACnetConstructedDataOctetstringValueAll.java  |    1 -
 .../BACnetConstructedDataOperationDirection.java   |    1 -
 .../BACnetConstructedDataOperationExpected.java    |    1 -
 .../readwrite/BACnetConstructedDataOptional.java   |    1 -
 .../BACnetConstructedDataOutOfService.java         |    1 -
 .../BACnetConstructedDataOutputUnits.java          |    1 -
 .../BACnetConstructedDataPacketReorderTime.java    |    1 -
 .../BACnetConstructedDataPassbackMode.java         |    1 -
 .../BACnetConstructedDataPassbackTimeout.java      |    1 -
 .../BACnetConstructedDataPassengerAlarm.java       |    1 -
 .../readwrite/BACnetConstructedDataPolarity.java   |    1 -
 .../readwrite/BACnetConstructedDataPortFilter.java |    1 -
 .../BACnetConstructedDataPositiveAccessRules.java  |    1 -
 ...CnetConstructedDataPositiveIntegerValueAll.java |    1 -
 ...ructedDataPositiveIntegerValueCOVIncrement.java |    1 -
 ...onstructedDataPositiveIntegerValueDeadband.java |    1 -
 ...ctedDataPositiveIntegerValueFaultHighLimit.java |    1 -
 ...uctedDataPositiveIntegerValueFaultLowLimit.java |    1 -
 ...nstructedDataPositiveIntegerValueHighLimit.java |    1 -
 ...onstructedDataPositiveIntegerValueLowLimit.java |    1 -
 ...ructedDataPositiveIntegerValueMaxPresValue.java |    1 -
 ...ructedDataPositiveIntegerValueMinPresValue.java |    1 -
 ...dDataPositiveIntegerValueRelinquishDefault.java |    1 -
 ...structedDataPositiveIntegerValueResolution.java |    1 -
 .../readwrite/BACnetConstructedDataPower.java      |    1 -
 .../readwrite/BACnetConstructedDataPowerMode.java  |    1 -
 .../readwrite/BACnetConstructedDataPrescale.java   |    1 -
 .../BACnetConstructedDataPresentValue.java         |    1 -
 .../readwrite/BACnetConstructedDataPriority.java   |    1 -
 .../BACnetConstructedDataPriorityArray.java        |    1 -
 .../BACnetConstructedDataPriorityForWriting.java   |    1 -
 .../BACnetConstructedDataProcessIdentifier.java    |    1 -
 ...CnetConstructedDataProcessIdentifierFilter.java |    1 -
 .../BACnetConstructedDataProfileLocation.java      |    1 -
 .../BACnetConstructedDataProfileName.java          |    1 -
 .../readwrite/BACnetConstructedDataProgramAll.java |    1 -
 .../BACnetConstructedDataProgramChange.java        |    1 -
 .../BACnetConstructedDataProgramLocation.java      |    1 -
 .../BACnetConstructedDataProgramState.java         |    1 -
 .../BACnetConstructedDataPropertyList.java         |    1 -
 .../BACnetConstructedDataProportionalConstant.java |    1 -
 ...etConstructedDataProportionalConstantUnits.java |    1 -
 .../BACnetConstructedDataProtocolLevel.java        |    1 -
 ...onstructedDataProtocolObjectTypesSupported.java |    1 -
 .../BACnetConstructedDataProtocolRevision.java     |    1 -
 ...etConstructedDataProtocolServicesSupported.java |    1 -
 .../BACnetConstructedDataProtocolVersion.java      |    1 -
 ...etConstructedDataPulseConverterAdjustValue.java |    1 -
 .../BACnetConstructedDataPulseConverterAll.java    |    1 -
 ...tConstructedDataPulseConverterPresentValue.java |    1 -
 .../readwrite/BACnetConstructedDataPulseRate.java  |    1 -
 .../readwrite/BACnetConstructedDataReadOnly.java   |    1 -
 .../BACnetConstructedDataReasonForDisable.java     |    1 -
 .../BACnetConstructedDataReasonForHalt.java        |    1 -
 .../BACnetConstructedDataRecipientList.java        |    1 -
 .../BACnetConstructedDataRecordCount.java          |    1 -
 ...netConstructedDataRecordsSinceNotification.java |    1 -
 .../BACnetConstructedDataReferencePort.java        |    1 -
 .../BACnetConstructedDataRegisteredCarCall.java    |    1 -
 .../BACnetConstructedDataReliability.java          |    1 -
 ...onstructedDataReliabilityEvaluationInhibit.java |    1 -
 .../BACnetConstructedDataRelinquishDefault.java    |    1 -
 .../readwrite/BACnetConstructedDataRepresents.java |    1 -
 .../BACnetConstructedDataRequestedShedLevel.java   |    1 -
 ...CnetConstructedDataRequestedUpdateInterval.java |    1 -
 .../readwrite/BACnetConstructedDataRequired.java   |    1 -
 .../readwrite/BACnetConstructedDataResolution.java |    1 -
 ...nstructedDataRestartNotificationRecipients.java |    1 -
 ...BACnetConstructedDataRestoreCompletionTime.java |    1 -
 ...ACnetConstructedDataRestorePreparationTime.java |    1 -
 .../BACnetConstructedDataRoutingTable.java         |    1 -
 .../readwrite/BACnetConstructedDataScale.java      |    1 -
 .../BACnetConstructedDataScaleFactor.java          |    1 -
 .../BACnetConstructedDataScheduleAll.java          |    1 -
 .../BACnetConstructedDataScheduleDefault.java      |    1 -
 .../BACnetConstructedDataSchedulePresentValue.java |    1 -
 .../BACnetConstructedDataSecuredStatus.java        |    1 -
 .../BACnetConstructedDataSecurityPDUTimeout.java   |    1 -
 .../BACnetConstructedDataSecurityTimeWindow.java   |    1 -
 ...BACnetConstructedDataSegmentationSupported.java |    1 -
 .../BACnetConstructedDataSerialNumber.java         |    1 -
 .../readwrite/BACnetConstructedDataSetpoint.java   |    1 -
 .../BACnetConstructedDataSetpointReference.java    |    1 -
 .../readwrite/BACnetConstructedDataSetting.java    |    1 -
 .../BACnetConstructedDataShedDuration.java         |    1 -
 ...BACnetConstructedDataShedLevelDescriptions.java |    1 -
 .../readwrite/BACnetConstructedDataShedLevels.java |    1 -
 .../readwrite/BACnetConstructedDataSilenced.java   |    1 -
 .../BACnetConstructedDataSlaveAddressBinding.java  |    1 -
 .../BACnetConstructedDataSlaveProxyEnable.java     |    1 -
 .../readwrite/BACnetConstructedDataStartTime.java  |    1 -
 .../BACnetConstructedDataStateChangeValues.java    |    1 -
 .../BACnetConstructedDataStateDescription.java     |    1 -
 .../readwrite/BACnetConstructedDataStateText.java  |    1 -
 .../BACnetConstructedDataStatusFlags.java          |    1 -
 .../readwrite/BACnetConstructedDataStopTime.java   |    1 -
 .../BACnetConstructedDataStopWhenFull.java         |    1 -
 .../BACnetConstructedDataStrikeCount.java          |    1 -
 .../BACnetConstructedDataStructuredObjectList.java |    1 -
 .../BACnetConstructedDataStructuredViewAll.java    |    1 -
 ...ACnetConstructedDataSubordinateAnnotations.java |    1 -
 .../BACnetConstructedDataSubordinateList.java      |    1 -
 .../BACnetConstructedDataSubordinateNodeTypes.java |    1 -
 ...netConstructedDataSubordinateRelationships.java |    1 -
 .../BACnetConstructedDataSubordinateTags.java      |    1 -
 .../BACnetConstructedDataSubscribedRecipients.java |    1 -
 ...ACnetConstructedDataSupportedFormatClasses.java |    1 -
 .../BACnetConstructedDataSupportedFormats.java     |    1 -
 ...ConstructedDataSupportedSecurityAlgorithms.java |    1 -
 .../BACnetConstructedDataSystemStatus.java         |    1 -
 .../readwrite/BACnetConstructedDataTags.java       |    1 -
 .../BACnetConstructedDataThreatAuthority.java      |    1 -
 .../BACnetConstructedDataThreatLevel.java          |    1 -
 .../readwrite/BACnetConstructedDataTimeDelay.java  |    1 -
 .../BACnetConstructedDataTimeDelayNormal.java      |    1 -
 ...BACnetConstructedDataTimeOfActiveTimeReset.java |    1 -
 .../BACnetConstructedDataTimeOfDeviceRestart.java  |    1 -
 ...BACnetConstructedDataTimeOfStateCountReset.java |    1 -
 ...ACnetConstructedDataTimeOfStrikeCountReset.java |    1 -
 ...onstructedDataTimePatternValuePresentValue.java |    1 -
 ...uctedDataTimePatternValueRelinquishDefault.java |    1 -
 ...ConstructedDataTimeSynchronizationInterval.java |    1 -
 ...nstructedDataTimeSynchronizationRecipients.java |    1 -
 .../BACnetConstructedDataTimeValueAll.java         |    1 -
 ...BACnetConstructedDataTimeValuePresentValue.java |    1 -
 ...tConstructedDataTimeValueRelinquishDefault.java |    1 -
 .../BACnetConstructedDataTimepatternValueAll.java  |    1 -
 .../BACnetConstructedDataTimerAlarmValues.java     |    1 -
 .../readwrite/BACnetConstructedDataTimerAll.java   |    1 -
 .../BACnetConstructedDataTimerMaxPresValue.java    |    1 -
 .../BACnetConstructedDataTimerMinPresValue.java    |    1 -
 .../BACnetConstructedDataTimerResolution.java      |    1 -
 .../BACnetConstructedDataTimerRunning.java         |    1 -
 .../readwrite/BACnetConstructedDataTimerState.java |    1 -
 .../BACnetConstructedDataTotalRecordCount.java     |    1 -
 .../readwrite/BACnetConstructedDataTraceFlag.java  |    1 -
 .../BACnetConstructedDataTrackingValue.java        |    1 -
 ...onstructedDataTransactionNotificationClass.java |    1 -
 .../readwrite/BACnetConstructedDataTransition.java |    1 -
 .../BACnetConstructedDataTrendLogAll.java          |    1 -
 .../BACnetConstructedDataTrendLogLogBuffer.java    |    1 -
 ...tructedDataTrendLogLogDeviceObjectProperty.java |    1 -
 .../BACnetConstructedDataTrendLogMultipleAll.java  |    1 -
 ...etConstructedDataTrendLogMultipleLogBuffer.java |    1 -
 ...ataTrendLogMultipleLogDeviceObjectProperty.java |    1 -
 .../readwrite/BACnetConstructedDataTrigger.java    |    1 -
 .../readwrite/BACnetConstructedDataUTCOffset.java  |    1 -
 ...ructedDataUTCTimeSynchronizationRecipients.java |    1 -
 .../readwrite/BACnetConstructedDataUnits.java      |    1 -
 .../BACnetConstructedDataUnspecified.java          |    1 -
 .../BACnetConstructedDataUpdateInterval.java       |    1 -
 .../BACnetConstructedDataUpdateKeySetTimeout.java  |    1 -
 .../readwrite/BACnetConstructedDataUpdateTime.java |    1 -
 ...ACnetConstructedDataUserExternalIdentifier.java |    1 -
 ...netConstructedDataUserInformationReference.java |    1 -
 .../readwrite/BACnetConstructedDataUserName.java   |    1 -
 .../readwrite/BACnetConstructedDataUserType.java   |    1 -
 .../BACnetConstructedDataUsesRemaining.java        |    1 -
 .../BACnetConstructedDataVTClassesSupported.java   |    1 -
 .../BACnetConstructedDataValidSamples.java         |    1 -
 .../BACnetConstructedDataValueBeforeChange.java    |    1 -
 .../BACnetConstructedDataValueChangeTime.java      |    1 -
 .../readwrite/BACnetConstructedDataValueSet.java   |    1 -
 .../BACnetConstructedDataValueSource.java          |    1 -
 .../BACnetConstructedDataValueSourceArray.java     |    1 -
 .../BACnetConstructedDataVarianceValue.java        |    1 -
 .../BACnetConstructedDataVendorIdentifier.java     |    1 -
 .../readwrite/BACnetConstructedDataVendorName.java |    1 -
 .../BACnetConstructedDataVerificationTime.java     |    1 -
 ...ACnetConstructedDataVirtualMACAddressTable.java |    1 -
 .../BACnetConstructedDataWeeklySchedule.java       |    1 -
 .../BACnetConstructedDataWindowInterval.java       |    1 -
 .../BACnetConstructedDataWindowSamples.java        |    1 -
 .../BACnetConstructedDataWriteStatus.java          |    1 -
 .../readwrite/BACnetConstructedDataZoneFrom.java   |    1 -
 .../BACnetConstructedDataZoneMembers.java          |    1 -
 .../readwrite/BACnetConstructedDataZoneTo.java     |    1 -
 .../java/bacnetip/readwrite/BACnetContextTag.java  |   18 +-
 .../readwrite/BACnetContextTagBitString.java       |    5 +-
 .../readwrite/BACnetContextTagBoolean.java         |    5 +-
 .../readwrite/BACnetContextTagCharacterString.java |    5 +-
 .../bacnetip/readwrite/BACnetContextTagDate.java   |    1 -
 .../bacnetip/readwrite/BACnetContextTagDouble.java |    1 -
 .../readwrite/BACnetContextTagEnumerated.java      |    5 +-
 .../bacnetip/readwrite/BACnetContextTagNull.java   |    5 +-
 .../BACnetContextTagObjectIdentifier.java          |    1 -
 .../readwrite/BACnetContextTagOctetString.java     |    5 +-
 .../bacnetip/readwrite/BACnetContextTagReal.java   |    1 -
 .../readwrite/BACnetContextTagSignedInteger.java   |    5 +-
 .../bacnetip/readwrite/BACnetContextTagTime.java   |    1 -
 .../readwrite/BACnetContextTagUnknown.java         |   19 +-
 .../readwrite/BACnetContextTagUnsignedInteger.java |    5 +-
 .../bacnetip/readwrite/BACnetErrorGeneral.java     |    1 -
 .../BACnetEventLogRecordLogDatumLogStatus.java     |    1 -
 .../BACnetEventLogRecordLogDatumNotification.java  |    1 -
 .../BACnetEventLogRecordLogDatumTimeChange.java    |    1 -
 .../readwrite/BACnetEventParameterAccessEvent.java |    1 -
 .../readwrite/BACnetEventParameterBufferReady.java |    1 -
 .../BACnetEventParameterChangeOfBitstring.java     |    1 -
 ...ACnetEventParameterChangeOfCharacterString.java |    1 -
 .../BACnetEventParameterChangeOfDiscreteValue.java |    1 -
 .../BACnetEventParameterChangeOfLifeSavety.java    |    1 -
 .../BACnetEventParameterChangeOfState.java         |    1 -
 .../BACnetEventParameterChangeOfStatusFlags.java   |    1 -
 .../BACnetEventParameterChangeOfTimer.java         |    1 -
 .../BACnetEventParameterChangeOfValue.java         |    1 -
 ...ntParameterChangeOfValueCivCriteriaBitmask.java |    1 -
 ...alueCivCriteriaReferencedPropertyIncrement.java |    1 -
 .../BACnetEventParameterCommandFailure.java        |    1 -
 .../BACnetEventParameterDoubleOutOfRange.java      |    1 -
 .../readwrite/BACnetEventParameterExtended.java    |    1 -
 .../BACnetEventParameterFloatingLimit.java         |    1 -
 .../readwrite/BACnetEventParameterNone.java        |    1 -
 .../readwrite/BACnetEventParameterOutOfRange.java  |    1 -
 .../BACnetEventParameterSignedOutOfRange.java      |    1 -
 .../BACnetEventParameterUnsignedOutOfRange.java    |    1 -
 .../BACnetEventParameterUnsignedRange.java         |    1 -
 .../BACnetFaultParameterFaultCharacterString.java  |    1 -
 .../BACnetFaultParameterFaultExtended.java         |    1 -
 ...meterFaultExtendedParametersEntryBitString.java |    1 -
 ...rameterFaultExtendedParametersEntryBoolean.java |    1 -
 ...aultExtendedParametersEntryCharacterString.java |    1 -
 ...tParameterFaultExtendedParametersEntryDate.java |    1 -
 ...arameterFaultExtendedParametersEntryDouble.java |    1 -
 ...eterFaultExtendedParametersEntryEnumerated.java |    1 -
 ...rameterFaultExtendedParametersEntryInteger.java |    1 -
 ...tParameterFaultExtendedParametersEntryNull.java |    1 -
 ...ultExtendedParametersEntryObjectidentifier.java |    1 -
 ...terFaultExtendedParametersEntryOctetString.java |    1 -
 ...tParameterFaultExtendedParametersEntryReal.java |    1 -
 ...meterFaultExtendedParametersEntryReference.java |    1 -
 ...tParameterFaultExtendedParametersEntryTime.java |    1 -
 ...ameterFaultExtendedParametersEntryUnsigned.java |    1 -
 .../BACnetFaultParameterFaultLifeSafety.java       |    1 -
 .../readwrite/BACnetFaultParameterFaultListed.java |    1 -
 .../BACnetFaultParameterFaultOutOfRange.java       |    1 -
 ...rameterFaultOutOfRangeMaxNormalValueDouble.java |    1 -
 ...ameterFaultOutOfRangeMaxNormalValueInteger.java |    1 -
 ...ParameterFaultOutOfRangeMaxNormalValueReal.java |    1 -
 ...meterFaultOutOfRangeMaxNormalValueUnsigned.java |    1 -
 ...rameterFaultOutOfRangeMinNormalValueDouble.java |    1 -
 ...ameterFaultOutOfRangeMinNormalValueInteger.java |    1 -
 ...ParameterFaultOutOfRangeMinNormalValueReal.java |    1 -
 ...meterFaultOutOfRangeMinNormalValueUnsigned.java |    1 -
 .../readwrite/BACnetFaultParameterFaultState.java  |    1 -
 .../BACnetFaultParameterFaultStatusFlags.java      |    1 -
 .../readwrite/BACnetFaultParameterNone.java        |    1 -
 .../readwrite/BACnetHostAddressIpAddress.java      |    1 -
 .../bacnetip/readwrite/BACnetHostAddressName.java  |    1 -
 .../bacnetip/readwrite/BACnetHostAddressNull.java  |    1 -
 .../BACnetLandingCallStatusCommandDestination.java |    1 -
 .../BACnetLandingCallStatusCommandDirection.java   |    1 -
 .../bacnetip/readwrite/BACnetLogDataLogData.java   |    1 -
 .../BACnetLogDataLogDataEntryAnyValue.java         |    1 -
 .../BACnetLogDataLogDataEntryBitStringValue.java   |    1 -
 .../BACnetLogDataLogDataEntryBooleanValue.java     |    1 -
 .../BACnetLogDataLogDataEntryEnumeratedValue.java  |    1 -
 .../BACnetLogDataLogDataEntryFailure.java          |    1 -
 .../BACnetLogDataLogDataEntryIntegerValue.java     |    1 -
 .../BACnetLogDataLogDataEntryNullValue.java        |    1 -
 .../BACnetLogDataLogDataEntryRealValue.java        |    1 -
 .../BACnetLogDataLogDataEntryUnsignedValue.java    |    1 -
 .../readwrite/BACnetLogDataLogDataTimeChange.java  |    1 -
 .../bacnetip/readwrite/BACnetLogDataLogStatus.java |    1 -
 .../readwrite/BACnetLogRecordLogDatumAnyValue.java |    1 -
 .../BACnetLogRecordLogDatumBitStringValue.java     |    1 -
 .../BACnetLogRecordLogDatumBooleanValue.java       |    1 -
 .../BACnetLogRecordLogDatumEnumeratedValue.java    |    1 -
 .../readwrite/BACnetLogRecordLogDatumFailure.java  |    1 -
 .../BACnetLogRecordLogDatumIntegerValue.java       |    1 -
 .../BACnetLogRecordLogDatumLogStatus.java          |    1 -
 .../BACnetLogRecordLogDatumNullValue.java          |    1 -
 .../BACnetLogRecordLogDatumRealValue.java          |    1 -
 .../BACnetLogRecordLogDatumTimeChange.java         |    1 -
 .../BACnetLogRecordLogDatumUnsignedValue.java      |    1 -
 .../readwrite/BACnetNotificationParameters.java    |   40 +-
 .../BACnetNotificationParametersAccessEvent.java   |    5 +-
 .../BACnetNotificationParametersBufferReady.java   |    5 +-
 ...netNotificationParametersChangeOfBitString.java |    5 +-
 ...ificationParametersChangeOfCharacterString.java |    5 +-
 ...otificationParametersChangeOfDiscreteValue.java |    5 +-
 ...metersChangeOfDiscreteValueNewValueBoolean.java |    1 -
 ...angeOfDiscreteValueNewValueCharacterString.java |    1 -
 ...etersChangeOfDiscreteValueNewValueDatetime.java |    1 -
 ...ersChangeOfDiscreteValueNewValueEnumerated.java |    1 -
 ...metersChangeOfDiscreteValueNewValueInteger.java |    1 -
 ...ngeOfDiscreteValueNewValueObjectidentifier.java |    1 -
 ...tersChangeOfDiscreteValueNewValueOctetDate.java |    1 -
 ...rsChangeOfDiscreteValueNewValueOctetString.java |    1 -
 ...tersChangeOfDiscreteValueNewValueOctetTime.java |    1 -
 ...etersChangeOfDiscreteValueNewValueUnsigned.java |    1 -
 ...etNotificationParametersChangeOfLifeSafety.java |    5 +-
 ...tNotificationParametersChangeOfReliability.java |    5 +-
 .../BACnetNotificationParametersChangeOfState.java |    5 +-
 ...tNotificationParametersChangeOfStatusFlags.java |    5 +-
 .../BACnetNotificationParametersChangeOfTimer.java |    5 +-
 .../BACnetNotificationParametersChangeOfValue.java |    5 +-
 ...otificationParametersChangeOfValueNewValue.java |    4 +-
 ...ParametersChangeOfValueNewValueChangedBits.java |    3 +-
 ...arametersChangeOfValueNewValueChangedValue.java |    3 +-
 ...BACnetNotificationParametersCommandFailure.java |    5 +-
 ...CnetNotificationParametersComplexEventType.java |    5 +-
 ...CnetNotificationParametersDoubleOutOfRange.java |    5 +-
 .../BACnetNotificationParametersExtended.java      |    5 +-
 .../BACnetNotificationParametersFloatingLimit.java |    5 +-
 .../BACnetNotificationParametersOutOfRange.java    |    5 +-
 ...CnetNotificationParametersSignedOutOfRange.java |    5 +-
 ...etNotificationParametersUnsignedOutOfRange.java |    5 +-
 .../BACnetNotificationParametersUnsignedRange.java |    5 +-
 .../readwrite/BACnetOptionalBinaryPVNull.java      |    1 -
 .../readwrite/BACnetOptionalBinaryPVValue.java     |    1 -
 .../BACnetOptionalCharacterStringNull.java         |    1 -
 .../BACnetOptionalCharacterStringValue.java        |    1 -
 .../bacnetip/readwrite/BACnetOptionalREALNull.java |    1 -
 .../readwrite/BACnetOptionalREALValue.java         |    1 -
 .../readwrite/BACnetOptionalUnsignedNull.java      |    1 -
 .../readwrite/BACnetOptionalUnsignedValue.java     |    1 -
 .../readwrite/BACnetPriorityValueBitString.java    |    1 -
 .../readwrite/BACnetPriorityValueBoolean.java      |    1 -
 .../BACnetPriorityValueCharacterString.java        |    1 -
 .../BACnetPriorityValueConstructedValue.java       |    1 -
 .../readwrite/BACnetPriorityValueDate.java         |    1 -
 .../readwrite/BACnetPriorityValueDateTime.java     |    1 -
 .../readwrite/BACnetPriorityValueDouble.java       |    1 -
 .../readwrite/BACnetPriorityValueEnumerated.java   |    1 -
 .../readwrite/BACnetPriorityValueInteger.java      |    1 -
 .../readwrite/BACnetPriorityValueNull.java         |    1 -
 .../BACnetPriorityValueObjectidentifier.java       |    1 -
 .../readwrite/BACnetPriorityValueOctetString.java  |    1 -
 .../readwrite/BACnetPriorityValueReal.java         |    1 -
 .../readwrite/BACnetPriorityValueTime.java         |    1 -
 .../readwrite/BACnetPriorityValueUnsigned.java     |    1 -
 .../readwrite/BACnetProcessIdSelectionNull.java    |    1 -
 .../readwrite/BACnetProcessIdSelectionValue.java   |    1 -
 ...ccessResultAccessResultPropertyAccessError.java |    1 -
 ...pertyAccessResultAccessResultPropertyValue.java |    1 -
 .../BACnetPropertyStateActionUnknown.java          |    1 -
 ...ACnetPropertyStatesAccessCredentialDisable.java |    1 -
 ...ropertyStatesAccessCredentialDisableReason.java |    1 -
 .../readwrite/BACnetPropertyStatesAccessEvent.java |    1 -
 .../readwrite/BACnetPropertyStatesAction.java      |    1 -
 .../BACnetPropertyStatesAuthenticationStatus.java  |    1 -
 .../readwrite/BACnetPropertyStatesBackupState.java |    1 -
 .../BACnetPropertyStatesBacnetIpMode.java          |    1 -
 .../BACnetPropertyStatesBinaryLightningValue.java  |    1 -
 .../readwrite/BACnetPropertyStatesBinaryValue.java |    1 -
 .../readwrite/BACnetPropertyStatesBoolean.java     |    1 -
 .../BACnetPropertyStatesDoorAlarmState.java        |    1 -
 .../BACnetPropertyStatesDoorSecuredStatus.java     |    1 -
 .../readwrite/BACnetPropertyStatesDoorStatus.java  |    1 -
 .../readwrite/BACnetPropertyStatesDoorValue.java   |    1 -
 .../BACnetPropertyStatesEscalatorFault.java        |    1 -
 .../BACnetPropertyStatesEscalatorMode.java         |    1 -
 ...tPropertyStatesEscalatorOperationDirection.java |    1 -
 .../readwrite/BACnetPropertyStatesEventType.java   |    1 -
 .../BACnetPropertyStatesExtendedValue.java         |    1 -
 .../BACnetPropertyStatesFileAccessMethod.java      |    1 -
 .../BACnetPropertyStatesIntegerValue.java          |    1 -
 .../BACnetPropertyStatesLifeSafetyMode.java        |    1 -
 .../BACnetPropertyStatesLifeSafetyOperations.java  |    1 -
 .../BACnetPropertyStatesLifeSafetyState.java       |    1 -
 .../BACnetPropertyStatesLiftCarDirection.java      |    1 -
 .../BACnetPropertyStatesLiftCarDoorCommand.java    |    1 -
 .../BACnetPropertyStatesLiftCarDriveStatus.java    |    1 -
 .../readwrite/BACnetPropertyStatesLiftCarMode.java |    1 -
 .../readwrite/BACnetPropertyStatesLiftFault.java   |    1 -
 .../BACnetPropertyStatesLiftGroupMode.java         |    1 -
 .../BACnetPropertyStatesLightningInProgress.java   |    1 -
 .../BACnetPropertyStatesLightningOperation.java    |    1 -
 .../BACnetPropertyStatesLightningTransition.java   |    1 -
 .../readwrite/BACnetPropertyStatesLockStatus.java  |    1 -
 .../readwrite/BACnetPropertyStatesMaintenance.java |    1 -
 .../BACnetPropertyStatesNetworkNumberQuality.java  |    1 -
 .../BACnetPropertyStatesNetworkPortCommand.java    |    1 -
 .../readwrite/BACnetPropertyStatesNetworkType.java |    1 -
 .../readwrite/BACnetPropertyStatesNodeType.java    |    1 -
 .../readwrite/BACnetPropertyStatesNotifyType.java  |    1 -
 .../readwrite/BACnetPropertyStatesPolarity.java    |    1 -
 .../BACnetPropertyStatesProgramChange.java         |    1 -
 .../BACnetPropertyStatesProtocolLevel.java         |    1 -
 .../BACnetPropertyStatesReasonForHalt.java         |    1 -
 .../readwrite/BACnetPropertyStatesReliability.java |    1 -
 .../BACnetPropertyStatesRestartReason.java         |    1 -
 .../BACnetPropertyStatesSecurityLevel.java         |    1 -
 .../readwrite/BACnetPropertyStatesShedState.java   |    1 -
 .../BACnetPropertyStatesSilencedState.java         |    1 -
 .../readwrite/BACnetPropertyStatesState.java       |    1 -
 .../BACnetPropertyStatesSystemStatus.java          |    1 -
 .../readwrite/BACnetPropertyStatesTimerState.java  |    1 -
 .../BACnetPropertyStatesTimerTransition.java       |    1 -
 .../readwrite/BACnetPropertyStatesUnits.java       |    1 -
 .../readwrite/BACnetPropertyStatesWriteStatus.java |    1 -
 .../BACnetPropertyStatesZoneOccupanyState.java     |    1 -
 .../bacnetip/readwrite/BACnetRecipientAddress.java |    1 -
 .../bacnetip/readwrite/BACnetRecipientDevice.java  |    1 -
 .../bacnetip/readwrite/BACnetScaleFloatScale.java  |    1 -
 .../readwrite/BACnetScaleIntegerScale.java         |    1 -
 .../java/bacnetip/readwrite/BACnetServiceAck.java  |    8 +-
 .../readwrite/BACnetServiceAckAtomicReadFile.java  |    1 -
 .../BACnetServiceAckAtomicReadFileRecord.java      |    1 -
 .../BACnetServiceAckAtomicReadFileStream.java      |    1 -
 .../readwrite/BACnetServiceAckAtomicWriteFile.java |    1 -
 .../readwrite/BACnetServiceAckAuthenticate.java    |   19 +-
 .../BACnetServiceAckConfirmedPrivateTransfer.java  |    1 -
 .../readwrite/BACnetServiceAckCreateObject.java    |    1 -
 .../readwrite/BACnetServiceAckGetAlarmSummary.java |    1 -
 .../BACnetServiceAckGetEnrollmentSummary.java      |    1 -
 .../BACnetServiceAckGetEventInformation.java       |    1 -
 .../readwrite/BACnetServiceAckReadProperty.java    |    1 -
 .../BACnetServiceAckReadPropertyConditional.java   |   19 +-
 .../BACnetServiceAckReadPropertyMultiple.java      |   19 +-
 .../readwrite/BACnetServiceAckReadRange.java       |    1 -
 .../readwrite/BACnetServiceAckRequestKey.java      |   19 +-
 .../bacnetip/readwrite/BACnetServiceAckVTData.java |    1 -
 .../bacnetip/readwrite/BACnetServiceAckVTOpen.java |    1 -
 .../bacnetip/readwrite/BACnetShedLevelAmount.java  |    1 -
 .../bacnetip/readwrite/BACnetShedLevelLevel.java   |    1 -
 .../bacnetip/readwrite/BACnetShedLevelPercent.java |    1 -
 .../BACnetSpecialEventPeriodCalendarEntry.java     |    1 -
 .../BACnetSpecialEventPeriodCalendarReference.java |    1 -
 .../readwrite/BACnetTimeStampDateTime.java         |    1 -
 .../readwrite/BACnetTimeStampSequence.java         |    1 -
 .../bacnetip/readwrite/BACnetTimeStampTime.java    |    1 -
 .../BACnetTimerStateChangeValueBitString.java      |    1 -
 .../BACnetTimerStateChangeValueBoolean.java        |    1 -
 ...BACnetTimerStateChangeValueCharacterString.java |    1 -
 ...ACnetTimerStateChangeValueConstructedValue.java |    1 -
 .../readwrite/BACnetTimerStateChangeValueDate.java |    1 -
 .../BACnetTimerStateChangeValueDateTime.java       |    1 -
 .../BACnetTimerStateChangeValueDouble.java         |    1 -
 .../BACnetTimerStateChangeValueEnumerated.java     |    1 -
 .../BACnetTimerStateChangeValueInteger.java        |    1 -
 ...BACnetTimerStateChangeValueLightingCommand.java |    1 -
 .../BACnetTimerStateChangeValueNoValue.java        |    1 -
 .../readwrite/BACnetTimerStateChangeValueNull.java |    1 -
 ...ACnetTimerStateChangeValueObjectidentifier.java |    1 -
 .../BACnetTimerStateChangeValueOctetString.java    |    1 -
 .../readwrite/BACnetTimerStateChangeValueReal.java |    1 -
 .../readwrite/BACnetTimerStateChangeValueTime.java |    1 -
 .../BACnetTimerStateChangeValueUnsigned.java       |    1 -
 .../BACnetUnconfirmedServiceRequestIAm.java        |    1 -
 .../BACnetUnconfirmedServiceRequestIHave.java      |    1 -
 ...confirmedServiceRequestTimeSynchronization.java |    1 -
 ...firmedServiceRequestUTCTimeSynchronization.java |    1 -
 ...edServiceRequestUnconfirmedCOVNotification.java |    1 -
 ...eRequestUnconfirmedCOVNotificationMultiple.java |    1 -
 ...ServiceRequestUnconfirmedEventNotification.java |    1 -
 ...edServiceRequestUnconfirmedPrivateTransfer.java |    1 -
 ...firmedServiceRequestUnconfirmedTextMessage.java |    1 -
 .../BACnetUnconfirmedServiceRequestUnknown.java    |    1 -
 .../BACnetUnconfirmedServiceRequestWhoHas.java     |    1 -
 ...firmedServiceRequestWhoHasObjectIdentifier.java |    1 -
 ...tUnconfirmedServiceRequestWhoHasObjectName.java |    1 -
 .../BACnetUnconfirmedServiceRequestWhoIs.java      |    1 -
 .../BACnetUnconfirmedServiceRequestWriteGroup.java |    1 -
 .../readwrite/BACnetValueSourceAddress.java        |    1 -
 .../bacnetip/readwrite/BACnetValueSourceNone.java  |    1 -
 .../readwrite/BACnetValueSourceObject.java         |    1 -
 .../BVLCDeleteForeignDeviceTableEntry.java         |    1 -
 .../BVLCDistributeBroadcastToNetwork.java          |    1 -
 .../java/bacnetip/readwrite/BVLCForwardedNPDU.java |    1 -
 .../readwrite/BVLCOriginalBroadcastNPDU.java       |    1 -
 .../readwrite/BVLCOriginalUnicastNPDU.java         |    1 -
 .../BVLCReadBroadcastDistributionTableAck.java     |    1 -
 .../readwrite/BVLCReadForeignDeviceTableAck.java   |    1 -
 .../readwrite/BVLCRegisterForeignDevice.java       |    1 -
 .../plc4x/java/bacnetip/readwrite/BVLCResult.java  |    1 -
 .../java/bacnetip/readwrite/BVLCSecureBVLL.java    |    1 -
 .../BVLCWriteBroadcastDistributionTable.java       |    1 -
 .../bacnetip/readwrite/ChangeListAddError.java     |    1 -
 .../bacnetip/readwrite/ChangeListRemoveError.java  |    1 -
 .../readwrite/ConfirmedPrivateTransferError.java   |    1 -
 .../java/bacnetip/readwrite/CreateObjectError.java |    1 -
 .../bacnetip/readwrite/NLMChallengeRequest.java    |    1 -
 .../NLMDisconnectConnectionToNetwork.java          |    1 -
 .../readwrite/NLMEstablishConnectionToNetwork.java |    1 -
 .../bacnetip/readwrite/NLMIAmRouterToNetwork.java  |    1 -
 .../readwrite/NLMICouldBeRouterToNetwork.java      |    1 -
 .../readwrite/NLMInitalizeRoutingTable.java        |    1 -
 .../readwrite/NLMInitalizeRoutingTableAck.java     |    1 -
 .../readwrite/NLMRejectRouterToNetwork.java        |    1 -
 .../bacnetip/readwrite/NLMRequestKeyUpdate.java    |    1 -
 .../bacnetip/readwrite/NLMRequestMasterKey.java    |    1 -
 .../plc4x/java/bacnetip/readwrite/NLMReserved.java |    1 -
 .../readwrite/NLMRouterAvailableToNetwork.java     |    1 -
 .../bacnetip/readwrite/NLMRouterBusyToNetwork.java |    1 -
 .../bacnetip/readwrite/NLMSecurityPayload.java     |    1 -
 .../bacnetip/readwrite/NLMSecurityResponse.java    |    1 -
 .../java/bacnetip/readwrite/NLMSetMasterKey.java   |    1 -
 .../readwrite/NLMUpdateKeyDistributionKey.java     |    1 -
 .../bacnetip/readwrite/NLMUpdateKeyUpdate.java     |    1 -
 .../readwrite/NLMVendorProprietaryMessage.java     |    1 -
 .../bacnetip/readwrite/NLMWhatIsNetworkNumber.java |    1 -
 .../readwrite/NLMWhoIsRouterToNetwork.java         |    1 -
 .../plc4x/java/bacnetip/readwrite/NPDUControl.java |    1 +
 .../SubscribeCOVPropertyMultipleError.java         |    1 -
 .../java/bacnetip/readwrite/VTCloseError.java      |    1 -
 .../readwrite/WritePropertyMultipleError.java      |    1 -
 plc4j/drivers/c-bus/pom.xml                        |    5 +
 .../AccessControlDataInvalidAccessRequest.java     |    1 -
 .../AccessControlDataValidAccessRequest.java       |    1 -
 .../AirConditioningDataHumidityScheduleEntry.java  |    1 -
 .../AirConditioningDataHvacScheduleEntry.java      |    1 -
 .../cbus/readwrite/AirConditioningDataRefresh.java |    1 -
 ...ConditioningDataSetHumidityLowerGuardLimit.java |    1 -
 ...AirConditioningDataSetHumiditySetbackLimit.java |    1 -
 ...ConditioningDataSetHumidityUpperGuardLimit.java |    1 -
 .../AirConditioningDataSetHvacLowerGuardLimit.java |    1 -
 .../AirConditioningDataSetHvacSetbackLimit.java    |    1 -
 .../AirConditioningDataSetHvacUpperGuardLimit.java |    1 -
 .../AirConditioningDataSetPlantHumidityLevel.java  |    1 -
 .../AirConditioningDataSetPlantHvacLevel.java      |    1 -
 .../AirConditioningDataSetZoneGroupOff.java        |    1 -
 .../AirConditioningDataSetZoneGroupOn.java         |    1 -
 .../AirConditioningDataSetZoneHumidityMode.java    |    1 -
 .../AirConditioningDataSetZoneHvacMode.java        |    1 -
 .../readwrite/AirConditioningDataZoneHumidity.java |    1 -
 ...AirConditioningDataZoneHumidityPlantStatus.java |    1 -
 .../AirConditioningDataZoneHvacPlantStatus.java    |    1 -
 .../AirConditioningDataZoneTemperature.java        |    1 -
 .../apache/plc4x/java/cbus/readwrite/CALData.java  |   10 +-
 .../java/cbus/readwrite/CALDataAcknowledge.java    |    1 -
 .../java/cbus/readwrite/CALDataGetStatus.java      |    1 -
 .../plc4x/java/cbus/readwrite/CALDataIdentify.java |    1 -
 .../java/cbus/readwrite/CALDataIdentifyReply.java  |    5 +-
 .../plc4x/java/cbus/readwrite/CALDataRecall.java   |    1 -
 .../plc4x/java/cbus/readwrite/CALDataReply.java    |    5 +-
 .../plc4x/java/cbus/readwrite/CALDataReset.java    |    1 -
 .../plc4x/java/cbus/readwrite/CALDataStatus.java   |    5 +-
 .../java/cbus/readwrite/CALDataStatusExtended.java |    5 +-
 .../plc4x/java/cbus/readwrite/CALDataWrite.java    |    5 +-
 .../plc4x/java/cbus/readwrite/CALReplyShort.java   |    1 -
 .../readwrite/CBusCommandDeviceManagement.java     |    1 -
 .../readwrite/CBusCommandPointToMultiPoint.java    |    1 -
 .../cbus/readwrite/CBusCommandPointToPoint.java    |    1 -
 .../CBusCommandPointToPointToMultiPoint.java       |    1 -
 .../java/cbus/readwrite/CBusMessageToClient.java   |    1 -
 .../java/cbus/readwrite/CBusMessageToServer.java   |    1 -
 .../readwrite/CBusPointToPointCommandIndirect.java |    1 -
 .../CBusPointToPointToMultiPointCommandNormal.java |    1 -
 .../ClockAndTimekeepingDataUpdateDate.java         |    1 -
 .../ClockAndTimekeepingDataUpdateTime.java         |    1 -
 .../java/cbus/readwrite/EncodedReplyCALReply.java  |    1 -
 .../cbus/readwrite/ErrorReportingDataGeneric.java  |    1 -
 ...ystemCategoryTypeBuildingManagementSystems.java |    1 -
 ...ortingSystemCategoryTypeClimateControllers.java |    1 -
 ...ErrorReportingSystemCategoryTypeInputUnits.java |    1 -
 ...rrorReportingSystemCategoryTypeOutputUnits.java |    1 -
 .../ErrorReportingSystemCategoryTypeReserved.java  |    1 -
 ...rorReportingSystemCategoryTypeSupportUnits.java |    1 -
 .../java/cbus/readwrite/HVACAuxiliaryLevel.java    |    1 +
 .../cbus/readwrite/HVACHumidityModeAndFlags.java   |    1 +
 .../cbus/readwrite/HVACHumidityStatusFlags.java    |    1 +
 .../java/cbus/readwrite/HVACModeAndFlags.java      |    1 +
 .../plc4x/java/cbus/readwrite/HVACStatusFlags.java |    1 +
 .../IdentifyReplyCommandCurrentSenseLevels.java    |    1 -
 .../readwrite/IdentifyReplyCommandDSIStatus.java   |    1 -
 .../cbus/readwrite/IdentifyReplyCommandDelays.java |    1 -
 .../IdentifyReplyCommandFirmwareVersion.java       |    1 -
 .../IdentifyReplyCommandGAVPhysicalAddresses.java  |    1 -
 .../IdentifyReplyCommandGAVValuesCurrent.java      |    1 -
 .../IdentifyReplyCommandGAVValuesStored.java       |    1 -
 .../IdentifyReplyCommandLogicalAssignment.java     |    1 -
 .../IdentifyReplyCommandManufacturer.java          |    1 -
 .../IdentifyReplyCommandMaximumLevels.java         |    1 -
 .../IdentifyReplyCommandMinimumLevels.java         |    1 -
 .../IdentifyReplyCommandNetworkTerminalLevels.java |    1 -
 .../IdentifyReplyCommandNetworkVoltage.java        |    1 -
 .../IdentifyReplyCommandOutputUnitSummary.java     |    1 -
 .../readwrite/IdentifyReplyCommandSummary.java     |    1 -
 .../IdentifyReplyCommandTerminalLevels.java        |    1 -
 .../cbus/readwrite/IdentifyReplyCommandType.java   |    1 -
 .../java/cbus/readwrite/InterfaceOptions1.java     |    1 +
 .../java/cbus/readwrite/InterfaceOptions2.java     |    1 +
 .../java/cbus/readwrite/InterfaceOptions3.java     |    1 +
 .../cbus/readwrite/LevelInformationAbsent.java     |    1 +
 .../cbus/readwrite/LevelInformationCorrupted.java  |    1 -
 .../cbus/readwrite/LevelInformationNormal.java     |    1 -
 .../java/cbus/readwrite/LightingDataLabel.java     |    1 -
 .../plc4x/java/cbus/readwrite/LightingDataOff.java |    1 -
 .../plc4x/java/cbus/readwrite/LightingDataOn.java  |    1 -
 .../cbus/readwrite/LightingDataRampToLevel.java    |    1 -
 .../cbus/readwrite/LightingDataTerminateRamp.java  |    1 -
 .../java/cbus/readwrite/LightingLabelOptions.java  |    1 +
 .../plc4x/java/cbus/readwrite/LogicAssignment.java |    1 +
 .../MeasurementDataChannelMeasurementData.java     |    1 -
 .../MediaTransportControlDataCategoryName.java     |    1 -
 ...trolDataEnumerateCategoriesSelectionTracks.java |    1 -
 .../MediaTransportControlDataEnumerationsSize.java |    1 -
 .../MediaTransportControlDataFastForward.java      |    1 -
 ...iaTransportControlDataNextPreviousCategory.java |    1 -
 ...aTransportControlDataNextPreviousSelection.java |    1 -
 ...MediaTransportControlDataNextPreviousTrack.java |    1 -
 .../MediaTransportControlDataPauseResume.java      |    1 -
 .../MediaTransportControlDataRepeatOnOff.java      |    1 -
 .../readwrite/MediaTransportControlDataRewind.java |    1 -
 .../MediaTransportControlDataSelectionName.java    |    1 -
 .../MediaTransportControlDataSetCategory.java      |    1 -
 .../MediaTransportControlDataSetSelection.java     |    1 -
 .../MediaTransportControlDataSetTrack.java         |    1 -
 .../MediaTransportControlDataShuffleOnOff.java     |    1 -
 ...ediaTransportControlDataSourcePowerControl.java |    1 -
 .../MediaTransportControlDataTotalTracks.java      |    1 -
 .../MediaTransportControlDataTrackName.java        |    1 -
 .../MeteringDataDrinkingWaterConsumption.java      |    1 -
 .../MeteringDataElectricityConsumption.java        |    1 -
 .../cbus/readwrite/MeteringDataGasConsumption.java |    1 -
 .../cbus/readwrite/MeteringDataOilConsumption.java |    1 -
 .../MeteringDataOtherWaterConsumption.java         |    1 -
 .../java/cbus/readwrite/MonitoredSALReply.java     |    1 -
 .../readwrite/MonitoredSALShortFormBasicMode.java  |    1 -
 .../NetworkProtocolControlInformation.java         |    1 +
 .../java/cbus/readwrite/ParameterChangeReply.java  |    1 -
 .../ParameterValueApplicationAddress1.java         |    1 -
 .../ParameterValueApplicationAddress2.java         |    1 -
 .../readwrite/ParameterValueBaudRateSelector.java  |    1 -
 .../ParameterValueCustomManufacturer.java          |    1 -
 .../cbus/readwrite/ParameterValueCustomTypes.java  |    1 -
 .../readwrite/ParameterValueInterfaceOptions1.java |    1 -
 ...meterValueInterfaceOptions1PowerUpSettings.java |    1 -
 .../readwrite/ParameterValueInterfaceOptions2.java |    1 -
 .../readwrite/ParameterValueInterfaceOptions3.java |    1 -
 .../java/cbus/readwrite/ParameterValueRaw.java     |    1 -
 .../cbus/readwrite/ParameterValueSerialNumber.java |    1 -
 .../plc4x/java/cbus/readwrite/PowerUpReply.java    |    1 -
 .../java/cbus/readwrite/ReplyEncodedReply.java     |    1 -
 .../readwrite/ReplyOrConfirmationConfirmation.java |    1 -
 .../cbus/readwrite/ReplyOrConfirmationReply.java   |    1 -
 .../plc4x/java/cbus/readwrite/RequestCommand.java  |    1 -
 .../cbus/readwrite/RequestDirectCommandAccess.java |    1 -
 .../plc4x/java/cbus/readwrite/RequestEmpty.java    |    1 -
 .../plc4x/java/cbus/readwrite/RequestNull.java     |    1 -
 .../plc4x/java/cbus/readwrite/RequestObsolete.java |    1 -
 .../plc4x/java/cbus/readwrite/RequestReset.java    |    1 -
 .../readwrite/RequestSmartConnectShortcut.java     |    1 -
 .../java/cbus/readwrite/SALDataAccessControl.java  |    1 -
 .../cbus/readwrite/SALDataAirConditioning.java     |    1 -
 .../java/cbus/readwrite/SALDataAudioAndVideo.java  |    1 -
 .../cbus/readwrite/SALDataClockAndTimekeeping.java |    1 -
 .../java/cbus/readwrite/SALDataEnableControl.java  |    1 -
 .../java/cbus/readwrite/SALDataErrorReporting.java |    1 -
 .../plc4x/java/cbus/readwrite/SALDataHeating.java  |    1 -
 .../java/cbus/readwrite/SALDataHvacActuator.java   |    1 -
 .../cbus/readwrite/SALDataIrrigationControl.java   |    1 -
 .../plc4x/java/cbus/readwrite/SALDataLighting.java |    1 -
 .../java/cbus/readwrite/SALDataMeasurement.java    |    1 -
 .../java/cbus/readwrite/SALDataMediaTransport.java |    1 -
 .../plc4x/java/cbus/readwrite/SALDataMetering.java |    1 -
 .../SALDataPoolsSpasPondsFountainsControl.java     |    1 -
 .../plc4x/java/cbus/readwrite/SALDataSecurity.java |    1 -
 .../SALDataTelephonyStatusAndControl.java          |    1 -
 .../readwrite/SALDataTemperatureBroadcast.java     |    1 -
 .../java/cbus/readwrite/SALDataTriggerControl.java |    1 -
 .../java/cbus/readwrite/SALDataVentilation.java    |    1 -
 .../readwrite/SecurityDataArmReadyNotReady.java    |    1 -
 .../java/cbus/readwrite/SecurityDataArmSystem.java |    1 -
 .../cbus/readwrite/SecurityDataDisplayMessage.java |    1 -
 .../cbus/readwrite/SecurityDataEmulatedKeypad.java |    1 -
 .../java/cbus/readwrite/SecurityDataEvent.java     |    1 -
 .../readwrite/SecurityDataLowBatteryCharging.java  |    1 -
 .../plc4x/java/cbus/readwrite/SecurityDataOff.java |    1 -
 .../plc4x/java/cbus/readwrite/SecurityDataOn.java  |    1 -
 .../readwrite/SecurityDataPasswordEntryStatus.java |    1 -
 .../readwrite/SecurityDataRequestZoneName.java     |    1 -
 .../cbus/readwrite/SecurityDataStatusReport1.java  |    1 -
 .../cbus/readwrite/SecurityDataStatusReport2.java  |    1 -
 .../readwrite/SecurityDataSystemArmedDisarmed.java |    1 -
 .../cbus/readwrite/SecurityDataZoneIsolated.java   |    1 -
 .../java/cbus/readwrite/SecurityDataZoneName.java  |    1 -
 .../java/cbus/readwrite/SecurityDataZoneOpen.java  |    1 -
 .../cbus/readwrite/SecurityDataZoneSealed.java     |    1 -
 .../java/cbus/readwrite/SecurityDataZoneShort.java |    1 -
 .../cbus/readwrite/SecurityDataZoneUnsealed.java   |    1 -
 .../java/cbus/readwrite/ServerErrorReply.java      |    1 -
 .../cbus/readwrite/StatusRequestBinaryState.java   |    1 +
 .../StatusRequestBinaryStateDeprecated.java        |    1 +
 .../java/cbus/readwrite/StatusRequestLevel.java    |    1 +
 .../cbus/readwrite/TelephonyDataDialInFailure.java |    1 -
 .../readwrite/TelephonyDataDialOutFailure.java     |    1 -
 .../java/cbus/readwrite/TelephonyDataDivert.java   |    1 -
 .../TelephonyDataIsolateSecondaryOutlet.java       |    1 -
 .../cbus/readwrite/TelephonyDataLineOffHook.java   |    1 -
 .../readwrite/TelephonyDataRecallLastNumber.java   |    1 -
 .../TelephonyDataRecallLastNumberRequest.java      |    1 -
 .../java/cbus/readwrite/TelephonyDataRinging.java  |    1 +
 .../cbus/readwrite/TriggerControlDataLabel.java    |    1 -
 .../readwrite/TriggerControlDataTriggerEvent.java  |    1 -
 .../cbus/readwrite/TriggerControlLabelOptions.java |    1 +
 .../canopen/readwrite/CANOpenHeartbeatPayload.java |    1 -
 .../canopen/readwrite/CANOpenNetworkPayload.java   |   15 +-
 .../java/canopen/readwrite/CANOpenPDOPayload.java  |    1 -
 .../java/canopen/readwrite/CANOpenSDORequest.java  |    1 -
 .../java/canopen/readwrite/CANOpenSDOResponse.java |    1 -
 .../plc4x/java/canopen/readwrite/CANOpenTime.java  |    8 +-
 .../readwrite/CANOpenTimeSynchronization.java      |    1 -
 .../plc4x/java/canopen/readwrite/SDOAbort.java     |    8 +-
 .../java/canopen/readwrite/SDOAbortRequest.java    |    1 -
 .../java/canopen/readwrite/SDOAbortResponse.java   |    1 -
 .../java/canopen/readwrite/SDOBlockRequest.java    |    1 -
 .../java/canopen/readwrite/SDOBlockResponse.java   |    1 -
 .../readwrite/SDOInitiateDownloadRequest.java      |   16 +-
 .../readwrite/SDOInitiateDownloadResponse.java     |   24 +-
 .../SDOInitiateExpeditedUploadResponse.java        |   20 +-
 .../SDOInitiateSegmentedReservedResponse.java      |   30 +-
 .../SDOInitiateSegmentedUploadResponse.java        |   20 +-
 .../readwrite/SDOInitiateUploadRequest.java        |   24 +-
 .../readwrite/SDOInitiateUploadResponse.java       |   16 +-
 .../SDOInitiateUploadResponsePayload.java          |   11 +-
 .../plc4x/java/canopen/readwrite/SDOSegment.java   |    8 +-
 .../readwrite/SDOSegmentDownloadRequest.java       |    1 -
 .../readwrite/SDOSegmentDownloadResponse.java      |   24 +-
 .../canopen/readwrite/SDOSegmentUploadRequest.java |   24 +-
 .../readwrite/SDOSegmentUploadResponse.java        |    1 -
 .../canopen/SDODownloadConversation.java           |    4 +-
 .../eip/readwrite/protocol/EipProtocolLogic.java   |   49 +-
 .../java/firmata/readwrite/FirmataCommand.java     |   11 +-
 .../readwrite/FirmataCommandProtocolVersion.java   |   21 +-
 .../FirmataCommandSetDigitalPinValue.java          |   30 +-
 .../readwrite/FirmataCommandSetPinMode.java        |   21 +-
 .../firmata/readwrite/FirmataCommandSysex.java     |   30 +-
 .../readwrite/FirmataCommandSystemReset.java       |   22 +-
 .../java/firmata/readwrite/FirmataMessage.java     |   11 +-
 .../firmata/readwrite/FirmataMessageAnalogIO.java  |   21 +-
 .../firmata/readwrite/FirmataMessageCommand.java   |   20 +-
 .../firmata/readwrite/FirmataMessageDigitalIO.java |   21 +-
 .../FirmataMessageSubscribeAnalogPinValue.java     |   28 +-
 .../FirmataMessageSubscribeDigitalPinValue.java    |   28 +-
 .../SysexCommandAnalogMappingQueryResponse.java    |    1 -
 .../firmata/readwrite/SysexCommandExtendedId.java  |    1 -
 .../readwrite/SysexCommandPinStateQuery.java       |    1 -
 .../readwrite/SysexCommandPinStateResponse.java    |    1 -
 .../SysexCommandReportFirmwareResponse.java        |    1 -
 .../readwrite/context/FirmataDriverContext.java    |   11 +-
 .../readwrite/protocol/FirmataProtocolLogic.java   |    2 +-
 .../apache/plc4x/java/knxnetip/readwrite/Apdu.java |   10 +-
 .../knxnetip/readwrite/ApduControlContainer.java   |   20 +-
 .../plc4x/java/knxnetip/readwrite/ApduData.java    |   11 +-
 .../java/knxnetip/readwrite/ApduDataAdcRead.java   |   22 +-
 .../knxnetip/readwrite/ApduDataAdcResponse.java    |   22 +-
 .../java/knxnetip/readwrite/ApduDataContainer.java |   20 +-
 .../readwrite/ApduDataDeviceDescriptorRead.java    |   20 +-
 .../ApduDataDeviceDescriptorResponse.java          |   21 +-
 .../plc4x/java/knxnetip/readwrite/ApduDataExt.java |   11 +-
 .../readwrite/ApduDataExtAuthorizeRequest.java     |   20 +-
 .../readwrite/ApduDataExtAuthorizeResponse.java    |   20 +-
 .../readwrite/ApduDataExtDomainAddressRead.java    |   21 +-
 .../ApduDataExtDomainAddressResponse.java          |   21 +-
 .../ApduDataExtDomainAddressSelectiveRead.java     |   21 +-
 .../ApduDataExtDomainAddressSerialNumberRead.java  |   21 +-
 ...duDataExtDomainAddressSerialNumberResponse.java |   21 +-
 .../ApduDataExtDomainAddressSerialNumberWrite.java |   21 +-
 .../readwrite/ApduDataExtDomainAddressWrite.java   |   21 +-
 .../readwrite/ApduDataExtFileStreamInfoReport.java |   21 +-
 .../ApduDataExtGroupPropertyValueInfoReport.java   |   21 +-
 .../ApduDataExtGroupPropertyValueRead.java         |   21 +-
 .../ApduDataExtGroupPropertyValueResponse.java     |   21 +-
 .../ApduDataExtGroupPropertyValueWrite.java        |   21 +-
 ...duDataExtIndividualAddressSerialNumberRead.java |   21 +-
 ...taExtIndividualAddressSerialNumberResponse.java |   21 +-
 ...uDataExtIndividualAddressSerialNumberWrite.java |   21 +-
 .../knxnetip/readwrite/ApduDataExtKeyResponse.java |   22 +-
 .../knxnetip/readwrite/ApduDataExtKeyWrite.java    |   22 +-
 .../knxnetip/readwrite/ApduDataExtLinkRead.java    |   22 +-
 .../readwrite/ApduDataExtLinkResponse.java         |   22 +-
 .../knxnetip/readwrite/ApduDataExtLinkWrite.java   |   22 +-
 .../readwrite/ApduDataExtMemoryBitWrite.java       |   22 +-
 .../readwrite/ApduDataExtNetworkParameterRead.java |   21 +-
 .../ApduDataExtNetworkParameterResponse.java       |   21 +-
 .../ApduDataExtNetworkParameterWrite.java          |   21 +-
 .../ApduDataExtOpenRoutingTableRequest.java        |   21 +-
 .../ApduDataExtPropertyDescriptionRead.java        |   22 +-
 .../ApduDataExtPropertyDescriptionResponse.java    |   46 +-
 .../readwrite/ApduDataExtPropertyValueRead.java    |   22 +-
 .../ApduDataExtPropertyValueResponse.java          |   20 +-
 .../readwrite/ApduDataExtPropertyValueWrite.java   |   20 +-
 .../ApduDataExtReadRouterMemoryRequest.java        |   21 +-
 .../ApduDataExtReadRouterMemoryResponse.java       |   21 +-
 .../ApduDataExtReadRouterStatusRequest.java        |   21 +-
 .../ApduDataExtReadRouterStatusResponse.java       |   21 +-
 .../ApduDataExtReadRoutingTableRequest.java        |   21 +-
 .../ApduDataExtReadRoutingTableResponse.java       |   21 +-
 .../ApduDataExtWriteRouterMemoryRequest.java       |   21 +-
 .../ApduDataExtWriteRouterStatusRequest.java       |   21 +-
 .../ApduDataExtWriteRoutingTableRequest.java       |   21 +-
 .../knxnetip/readwrite/ApduDataGroupValueRead.java |   31 +-
 .../readwrite/ApduDataGroupValueResponse.java      |   21 +-
 .../readwrite/ApduDataGroupValueWrite.java         |   20 +-
 .../readwrite/ApduDataIndividualAddressRead.java   |   21 +-
 .../ApduDataIndividualAddressResponse.java         |   21 +-
 .../readwrite/ApduDataIndividualAddressWrite.java  |   21 +-
 .../knxnetip/readwrite/ApduDataMemoryRead.java     |   20 +-
 .../knxnetip/readwrite/ApduDataMemoryResponse.java |   21 +-
 .../knxnetip/readwrite/ApduDataMemoryWrite.java    |   22 +-
 .../java/knxnetip/readwrite/ApduDataOther.java     |   20 +-
 .../java/knxnetip/readwrite/ApduDataRestart.java   |   22 +-
 .../knxnetip/readwrite/ApduDataUserMessage.java    |   22 +-
 .../apache/plc4x/java/knxnetip/readwrite/CEMI.java |   11 +-
 .../CEMIAdditionalInformationBusmonitorInfo.java   |    1 -
 ...CEMIAdditionalInformationRelativeTimestamp.java |    1 -
 .../readwrite/ComObjectTableRealisationType1.java  |    1 -
 .../readwrite/ComObjectTableRealisationType2.java  |    1 -
 .../readwrite/ComObjectTableRealisationType6.java  |    1 -
 .../java/knxnetip/readwrite/ConnectionRequest.java |    1 -
 ...nnectionRequestInformationTunnelConnection.java |   15 +-
 .../knxnetip/readwrite/ConnectionResponse.java     |    3 -
 ...onnectionResponseDataBlockTunnelConnection.java |    1 -
 .../knxnetip/readwrite/ConnectionStateRequest.java |   14 +-
 .../readwrite/ConnectionStateResponse.java         |    1 -
 .../knxnetip/readwrite/DescriptionRequest.java     |    1 -
 .../knxnetip/readwrite/DescriptionResponse.java    |    1 -
 .../knxnetip/readwrite/DeviceConfigurationAck.java |    1 -
 .../readwrite/DeviceConfigurationRequest.java      |   20 +-
 .../DeviceConfigurationRequestDataBlock.java       |    8 +-
 .../java/knxnetip/readwrite/DeviceStatus.java      |    8 +-
 .../java/knxnetip/readwrite/DisconnectRequest.java |   14 +-
 .../knxnetip/readwrite/DisconnectResponse.java     |    1 -
 .../GroupObjectDescriptorRealisationType1.java     |    8 +-
 .../java/knxnetip/readwrite/KnxDatapoint.java      |   33 +
 .../java/knxnetip/readwrite/KnxDatapointType.java  |  261 ++---
 .../knxnetip/readwrite/KnxGroupAddress2Level.java  |    1 -
 .../knxnetip/readwrite/KnxGroupAddress3Level.java  |    1 -
 .../readwrite/KnxGroupAddressFreeLevel.java        |    1 -
 .../java/knxnetip/readwrite/KnxManufacturer.java   |    4 +-
 .../java/knxnetip/readwrite/KnxNetIpCore.java      |    1 -
 .../readwrite/KnxNetIpDeviceManagement.java        |    1 -
 .../java/knxnetip/readwrite/KnxNetIpRouting.java   |    1 -
 .../java/knxnetip/readwrite/KnxNetIpTunneling.java |    1 -
 .../knxnetip/readwrite/KnxNetObjectServer.java     |    1 -
 .../KnxNetRemoteConfigurationAndDiagnosis.java     |    1 -
 .../knxnetip/readwrite/KnxNetRemoteLogging.java    |    1 -
 .../plc4x/java/knxnetip/readwrite/LBusmonInd.java  |   25 +-
 .../plc4x/java/knxnetip/readwrite/LDataCon.java    |   23 +-
 .../java/knxnetip/readwrite/LDataExtended.java     |    1 -
 .../plc4x/java/knxnetip/readwrite/LDataInd.java    |   23 +-
 .../plc4x/java/knxnetip/readwrite/LDataReq.java    |   23 +-
 .../plc4x/java/knxnetip/readwrite/LPollData.java   |   18 +-
 .../java/knxnetip/readwrite/LPollDataCon.java      |   22 +-
 .../java/knxnetip/readwrite/LPollDataReq.java      |   22 +-
 .../plc4x/java/knxnetip/readwrite/LRawCon.java     |   22 +-
 .../plc4x/java/knxnetip/readwrite/LRawInd.java     |   22 +-
 .../plc4x/java/knxnetip/readwrite/LRawReq.java     |   22 +-
 .../knxnetip/readwrite/MFuncPropCommandReq.java    |   22 +-
 .../java/knxnetip/readwrite/MFuncPropCon.java      |   22 +-
 .../knxnetip/readwrite/MFuncPropStateReadReq.java  |   22 +-
 .../java/knxnetip/readwrite/MPropInfoInd.java      |   22 +-
 .../java/knxnetip/readwrite/MPropReadCon.java      |   28 +-
 .../java/knxnetip/readwrite/MPropReadReq.java      |   22 +-
 .../java/knxnetip/readwrite/MPropWriteCon.java     |   22 +-
 .../java/knxnetip/readwrite/MPropWriteReq.java     |   22 +-
 .../plc4x/java/knxnetip/readwrite/MResetInd.java   |   22 +-
 .../plc4x/java/knxnetip/readwrite/MResetReq.java   |   22 +-
 .../java/knxnetip/readwrite/SearchRequest.java     |    1 -
 .../java/knxnetip/readwrite/SearchResponse.java    |    1 -
 .../java/knxnetip/readwrite/TDataConnectedInd.java |   22 +-
 .../java/knxnetip/readwrite/TDataConnectedReq.java |   22 +-
 .../knxnetip/readwrite/TDataIndividualInd.java     |   22 +-
 .../knxnetip/readwrite/TDataIndividualReq.java     |   22 +-
 .../java/knxnetip/readwrite/TunnelingRequest.java  |   17 +-
 .../readwrite/TunnelingRequestDataBlock.java       |    8 +-
 .../java/knxnetip/readwrite/TunnelingResponse.java |    1 -
 .../java/knxnetip/readwrite/UnknownMessage.java    |   15 +-
 .../knxnetip/protocol/KnxNetIpProtocolLogic.java   |    8 +-
 .../plc4x/java/modbus/readwrite/ModbusADU.java     |   11 +-
 .../java/modbus/readwrite/ModbusAsciiADU.java      |   20 +-
 .../readwrite/ModbusPDUDiagnosticRequest.java      |    1 -
 .../readwrite/ModbusPDUDiagnosticResponse.java     |    1 -
 .../java/modbus/readwrite/ModbusPDUError.java      |    1 -
 .../ModbusPDUGetComEventCounterResponse.java       |    1 -
 .../readwrite/ModbusPDUGetComEventLogResponse.java |    1 -
 .../ModbusPDUMaskWriteHoldingRegisterRequest.java  |    1 -
 .../ModbusPDUMaskWriteHoldingRegisterResponse.java |    1 -
 .../readwrite/ModbusPDUReadCoilsRequest.java       |    1 -
 .../readwrite/ModbusPDUReadCoilsResponse.java      |    1 -
 .../ModbusPDUReadDeviceIdentificationRequest.java  |    1 -
 .../ModbusPDUReadDeviceIdentificationResponse.java |    1 -
 .../ModbusPDUReadDiscreteInputsRequest.java        |    1 -
 .../ModbusPDUReadDiscreteInputsResponse.java       |    1 -
 .../ModbusPDUReadExceptionStatusResponse.java      |    1 -
 .../readwrite/ModbusPDUReadFifoQueueRequest.java   |    1 -
 .../readwrite/ModbusPDUReadFifoQueueResponse.java  |    1 -
 .../readwrite/ModbusPDUReadFileRecordRequest.java  |    1 -
 .../readwrite/ModbusPDUReadFileRecordResponse.java |    1 -
 .../ModbusPDUReadHoldingRegistersRequest.java      |    1 -
 .../ModbusPDUReadHoldingRegistersResponse.java     |    1 -
 .../ModbusPDUReadInputRegistersRequest.java        |    1 -
 .../ModbusPDUReadInputRegistersResponse.java       |    1 -
 ...DUReadWriteMultipleHoldingRegistersRequest.java |    1 -
 ...UReadWriteMultipleHoldingRegistersResponse.java |    1 -
 .../readwrite/ModbusPDUReportServerIdResponse.java |    1 -
 .../readwrite/ModbusPDUWriteFileRecordRequest.java |    1 -
 .../ModbusPDUWriteFileRecordResponse.java          |    1 -
 .../ModbusPDUWriteMultipleCoilsRequest.java        |    1 -
 .../ModbusPDUWriteMultipleCoilsResponse.java       |    1 -
 ...busPDUWriteMultipleHoldingRegistersRequest.java |    1 -
 ...usPDUWriteMultipleHoldingRegistersResponse.java |    1 -
 .../readwrite/ModbusPDUWriteSingleCoilRequest.java |    1 -
 .../ModbusPDUWriteSingleCoilResponse.java          |    1 -
 .../ModbusPDUWriteSingleRegisterRequest.java       |    1 -
 .../ModbusPDUWriteSingleRegisterResponse.java      |    1 -
 .../plc4x/java/modbus/readwrite/ModbusRtuADU.java  |   20 +-
 .../plc4x/java/modbus/readwrite/ModbusTcpADU.java  |   23 +-
 .../ascii/protocol/ModbusAsciiProtocolLogic.java   |    4 +-
 .../rtu/protocol/ModbusRtuProtocolLogic.java       |    4 +-
 .../modbus/tcp/discovery/ModbusPlcDiscoverer.java  |    2 +-
 .../tcp/protocol/ModbusTcpProtocolLogic.java       |    4 +-
 .../opcua/readwrite/ActivateSessionRequest.java    |    1 -
 .../opcua/readwrite/ActivateSessionResponse.java   |    1 -
 .../plc4x/java/opcua/readwrite/AddNodesItem.java   |    1 -
 .../java/opcua/readwrite/AddNodesRequest.java      |    1 -
 .../java/opcua/readwrite/AddNodesResponse.java     |    1 -
 .../plc4x/java/opcua/readwrite/AddNodesResult.java |    1 -
 .../java/opcua/readwrite/AddReferencesItem.java    |   21 +-
 .../java/opcua/readwrite/AddReferencesRequest.java |    1 -
 .../opcua/readwrite/AddReferencesResponse.java     |    1 -
 .../opcua/readwrite/AdditionalParametersType.java  |    1 -
 .../opcua/readwrite/AggregateConfiguration.java    |   27 +-
 .../java/opcua/readwrite/AliasNameDataType.java    |    1 -
 .../plc4x/java/opcua/readwrite/Annotation.java     |    1 -
 .../opcua/readwrite/ApplicationDescription.java    |    1 -
 .../plc4x/java/opcua/readwrite/Argument.java       |    1 -
 .../java/opcua/readwrite/AxisInformation.java      |    1 -
 .../java/opcua/readwrite/BrowseDescription.java    |   21 +-
 .../java/opcua/readwrite/BrowseNextRequest.java    |   19 +-
 .../java/opcua/readwrite/BrowseNextResponse.java   |    1 -
 .../plc4x/java/opcua/readwrite/BrowsePath.java     |    1 -
 .../java/opcua/readwrite/BrowsePathResult.java     |    1 -
 .../java/opcua/readwrite/BrowsePathTarget.java     |    1 -
 .../plc4x/java/opcua/readwrite/BrowseRequest.java  |    1 -
 .../plc4x/java/opcua/readwrite/BrowseResponse.java |    1 -
 .../plc4x/java/opcua/readwrite/BrowseResult.java   |    1 -
 .../plc4x/java/opcua/readwrite/BuildInfo.java      |    1 -
 .../java/opcua/readwrite/CallMethodRequest.java    |    1 -
 .../java/opcua/readwrite/CallMethodResult.java     |    1 -
 .../plc4x/java/opcua/readwrite/CallRequest.java    |    1 -
 .../plc4x/java/opcua/readwrite/CallResponse.java   |    1 -
 .../plc4x/java/opcua/readwrite/CancelRequest.java  |    1 -
 .../plc4x/java/opcua/readwrite/CancelResponse.java |    1 -
 .../java/opcua/readwrite/ChannelSecurityToken.java |    1 -
 .../opcua/readwrite/CloseSecureChannelRequest.java |    1 -
 .../readwrite/CloseSecureChannelResponse.java      |    1 -
 .../java/opcua/readwrite/CloseSessionRequest.java  |   16 +-
 .../java/opcua/readwrite/CloseSessionResponse.java |    1 -
 .../java/opcua/readwrite/ComplexNumberType.java    |    1 -
 .../readwrite/ConfigurationVersionDataType.java    |    1 -
 .../plc4x/java/opcua/readwrite/ContentFilter.java  |    1 -
 .../java/opcua/readwrite/ContentFilterElement.java |    1 -
 .../readwrite/ContentFilterElementResult.java      |    1 -
 .../java/opcua/readwrite/ContentFilterResult.java  |    1 -
 .../readwrite/CreateMonitoredItemsRequest.java     |    1 -
 .../readwrite/CreateMonitoredItemsResponse.java    |    1 -
 .../java/opcua/readwrite/CreateSessionRequest.java |    1 -
 .../opcua/readwrite/CreateSessionResponse.java     |    1 -
 .../opcua/readwrite/CreateSubscriptionRequest.java |   16 +-
 .../readwrite/CreateSubscriptionResponse.java      |    1 -
 .../java/opcua/readwrite/CurrencyUnitType.java     |    1 -
 .../opcua/readwrite/DataChangeNotification.java    |    1 -
 .../opcua/readwrite/DataSetWriterDataType.java     |   16 +-
 .../java/opcua/readwrite/DataTypeDescription.java  |    1 -
 .../java/opcua/readwrite/DataTypeSchemaHeader.java |    1 -
 .../plc4x/java/opcua/readwrite/DataValue.java      |   41 +-
 .../java/opcua/readwrite/DecimalDataType.java      |    1 -
 .../readwrite/DeleteMonitoredItemsRequest.java     |    1 -
 .../readwrite/DeleteMonitoredItemsResponse.java    |    1 -
 .../java/opcua/readwrite/DeleteNodesItem.java      |   15 +-
 .../java/opcua/readwrite/DeleteNodesRequest.java   |    1 -
 .../java/opcua/readwrite/DeleteNodesResponse.java  |    1 -
 .../java/opcua/readwrite/DeleteReferencesItem.java |   31 +-
 .../opcua/readwrite/DeleteReferencesRequest.java   |    1 -
 .../opcua/readwrite/DeleteReferencesResponse.java  |    1 -
 .../readwrite/DeleteSubscriptionsRequest.java      |    1 -
 .../readwrite/DeleteSubscriptionsResponse.java     |    1 -
 .../plc4x/java/opcua/readwrite/DiagnosticInfo.java |   37 +-
 .../opcua/readwrite/DoubleComplexNumberType.java   |    1 -
 .../plc4x/java/opcua/readwrite/EUInformation.java  |    1 -
 .../opcua/readwrite/EndpointConfiguration.java     |   16 +-
 .../java/opcua/readwrite/EndpointDescription.java  |    1 -
 .../plc4x/java/opcua/readwrite/EndpointType.java   |    1 -
 .../opcua/readwrite/EndpointUrlListDataType.java   |    1 -
 .../plc4x/java/opcua/readwrite/EnumValueType.java  |    1 -
 .../java/opcua/readwrite/EphemeralKeyType.java     |    1 -
 .../plc4x/java/opcua/readwrite/EventFieldList.java |    1 -
 .../opcua/readwrite/EventNotificationList.java     |    1 -
 .../plc4x/java/opcua/readwrite/ExpandedNodeId.java |    9 +-
 .../java/opcua/readwrite/ExtensionHeader.java      |    8 +-
 .../java/opcua/readwrite/ExtensionObject.java      |   15 +-
 .../readwrite/ExtensionObjectEncodingMask.java     |    8 +-
 .../plc4x/java/opcua/readwrite/FieldMetaData.java  |    1 -
 .../java/opcua/readwrite/FieldTargetDataType.java  |    1 -
 .../readwrite/FindServersOnNetworkRequest.java     |    1 -
 .../readwrite/FindServersOnNetworkResponse.java    |    1 -
 .../java/opcua/readwrite/FindServersRequest.java   |    1 -
 .../java/opcua/readwrite/FindServersResponse.java  |    1 -
 .../opcua/readwrite/GenericAttributeValue.java     |    1 -
 .../java/opcua/readwrite/GetEndpointsRequest.java  |    1 -
 .../java/opcua/readwrite/GetEndpointsResponse.java |    1 -
 .../plc4x/java/opcua/readwrite/HistoryData.java    |    1 -
 .../plc4x/java/opcua/readwrite/HistoryEvent.java   |    1 -
 .../opcua/readwrite/HistoryEventFieldList.java     |    1 -
 .../java/opcua/readwrite/HistoryReadRequest.java   |   16 +-
 .../java/opcua/readwrite/HistoryReadResponse.java  |    1 -
 .../java/opcua/readwrite/HistoryReadResult.java    |    1 -
 .../java/opcua/readwrite/HistoryReadValueId.java   |    1 -
 .../java/opcua/readwrite/HistoryUpdateDetails.java |    1 -
 .../java/opcua/readwrite/HistoryUpdateRequest.java |    1 -
 .../opcua/readwrite/HistoryUpdateResponse.java     |    1 -
 .../java/opcua/readwrite/HistoryUpdateResult.java  |    1 -
 .../opcua/readwrite/IdentityMappingRuleType.java   |    1 -
 .../java/opcua/readwrite/IssuedIdentityToken.java  |    1 -
 .../plc4x/java/opcua/readwrite/KeyValuePair.java   |    1 -
 .../plc4x/java/opcua/readwrite/LocalizedText.java  |   14 +-
 .../readwrite/ModelChangeStructureDataType.java    |    1 -
 .../java/opcua/readwrite/ModificationInfo.java     |    1 -
 .../readwrite/ModifyMonitoredItemsRequest.java     |    1 -
 .../readwrite/ModifyMonitoredItemsResponse.java    |    1 -
 .../opcua/readwrite/ModifySubscriptionRequest.java |    1 -
 .../readwrite/ModifySubscriptionResponse.java      |    1 -
 .../readwrite/MonitoredItemCreateRequest.java      |    1 -
 .../opcua/readwrite/MonitoredItemCreateResult.java |    1 -
 .../readwrite/MonitoredItemModifyRequest.java      |    1 -
 .../opcua/readwrite/MonitoredItemModifyResult.java |    1 -
 .../opcua/readwrite/MonitoredItemNotification.java |    1 -
 .../java/opcua/readwrite/MonitoringParameters.java |   15 +-
 .../opcua/readwrite/NetworkAddressDataType.java    |    1 -
 .../java/opcua/readwrite/NetworkGroupDataType.java |    1 -
 .../apache/plc4x/java/opcua/readwrite/Node.java    |    1 -
 .../plc4x/java/opcua/readwrite/NodeAttributes.java |    1 -
 .../apache/plc4x/java/opcua/readwrite/NodeId.java  |    8 +-
 .../java/opcua/readwrite/NodeIdByteString.java     |    1 -
 .../plc4x/java/opcua/readwrite/NodeIdFourByte.java |    1 -
 .../plc4x/java/opcua/readwrite/NodeIdGuid.java     |    1 -
 .../plc4x/java/opcua/readwrite/NodeIdNumeric.java  |    1 -
 .../plc4x/java/opcua/readwrite/NodeIdString.java   |    1 -
 .../plc4x/java/opcua/readwrite/NodeIdTwoByte.java  |    1 -
 .../plc4x/java/opcua/readwrite/NodeReference.java  |   20 +-
 .../java/opcua/readwrite/NodeTypeDescription.java  |   15 +-
 .../java/opcua/readwrite/NotificationMessage.java  |    1 -
 .../plc4x/java/opcua/readwrite/OpcuaAPU.java       |    8 +-
 .../opcua/readwrite/OpcuaAcknowledgeResponse.java  |    1 -
 .../java/opcua/readwrite/OpcuaCloseRequest.java    |    1 -
 .../java/opcua/readwrite/OpcuaHelloRequest.java    |    1 -
 .../java/opcua/readwrite/OpcuaMessageRequest.java  |    1 -
 .../java/opcua/readwrite/OpcuaMessageResponse.java |    1 -
 .../java/opcua/readwrite/OpcuaOpenRequest.java     |    1 -
 .../java/opcua/readwrite/OpcuaOpenResponse.java    |    1 -
 .../opcua/readwrite/OpenSecureChannelRequest.java  |    1 -
 .../opcua/readwrite/OpenSecureChannelResponse.java |    1 -
 .../plc4x/java/opcua/readwrite/OptionSet.java      |    1 -
 .../plc4x/java/opcua/readwrite/ParsingResult.java  |    1 -
 .../readwrite/ProgramDiagnostic2DataType.java      |    1 -
 .../opcua/readwrite/ProgramDiagnosticDataType.java |    1 -
 .../readwrite/PubSubConfigurationDataType.java     |   20 +-
 .../opcua/readwrite/PubSubConnectionDataType.java  |   16 +-
 .../java/opcua/readwrite/PubSubGroupDataType.java  |   16 +-
 .../plc4x/java/opcua/readwrite/PublishRequest.java |    1 -
 .../java/opcua/readwrite/PublishResponse.java      |   16 +-
 .../opcua/readwrite/PublishedVariableDataType.java |    1 -
 .../java/opcua/readwrite/QueryDataDescription.java |    1 -
 .../plc4x/java/opcua/readwrite/QueryDataSet.java   |    1 -
 .../java/opcua/readwrite/QueryFirstRequest.java    |    1 -
 .../java/opcua/readwrite/QueryFirstResponse.java   |    1 -
 .../java/opcua/readwrite/QueryNextRequest.java     |   15 +-
 .../java/opcua/readwrite/QueryNextResponse.java    |    1 -
 .../apache/plc4x/java/opcua/readwrite/Range.java   |    1 -
 .../plc4x/java/opcua/readwrite/RationalNumber.java |    1 -
 .../plc4x/java/opcua/readwrite/ReadRequest.java    |    1 -
 .../plc4x/java/opcua/readwrite/ReadResponse.java   |    1 -
 .../plc4x/java/opcua/readwrite/ReadValueId.java    |    1 -
 .../opcua/readwrite/RedundantServerDataType.java   |    1 -
 .../java/opcua/readwrite/ReferenceDescription.java |   22 +-
 .../plc4x/java/opcua/readwrite/ReferenceNode.java  |   14 +-
 .../java/opcua/readwrite/RegisterNodesRequest.java |    1 -
 .../opcua/readwrite/RegisterNodesResponse.java     |    1 -
 .../opcua/readwrite/RegisterServer2Request.java    |    1 -
 .../opcua/readwrite/RegisterServer2Response.java   |    1 -
 .../opcua/readwrite/RegisterServerRequest.java     |    1 -
 .../opcua/readwrite/RegisterServerResponse.java    |    1 -
 .../java/opcua/readwrite/RegisteredServer.java     |   16 +-
 .../plc4x/java/opcua/readwrite/RelativePath.java   |    1 -
 .../java/opcua/readwrite/RelativePathElement.java  |   15 +-
 .../java/opcua/readwrite/RepublishRequest.java     |    1 -
 .../java/opcua/readwrite/RepublishResponse.java    |    1 -
 .../plc4x/java/opcua/readwrite/RequestHeader.java  |    1 -
 .../plc4x/java/opcua/readwrite/ResponseHeader.java |    1 -
 .../java/opcua/readwrite/RolePermissionType.java   |    1 -
 .../SamplingIntervalDiagnosticsDataType.java       |    1 -
 .../readwrite/SemanticChangeStructureDataType.java |    1 -
 .../ServerDiagnosticsSummaryDataType.java          |    1 -
 .../java/opcua/readwrite/ServerOnNetwork.java      |    1 -
 .../java/opcua/readwrite/ServerStatusDataType.java |    1 -
 .../opcua/readwrite/ServiceCounterDataType.java    |    1 -
 .../plc4x/java/opcua/readwrite/ServiceFault.java   |    1 -
 .../readwrite/SessionDiagnosticsDataType.java      |    1 -
 .../SessionSecurityDiagnosticsDataType.java        |    1 -
 .../readwrite/SessionlessInvokeRequestType.java    |    1 -
 .../readwrite/SessionlessInvokeResponseType.java   |    1 -
 .../opcua/readwrite/SetMonitoringModeRequest.java  |    1 -
 .../opcua/readwrite/SetMonitoringModeResponse.java |    1 -
 .../opcua/readwrite/SetPublishingModeRequest.java  |   15 +-
 .../opcua/readwrite/SetPublishingModeResponse.java |    1 -
 .../java/opcua/readwrite/SetTriggeringRequest.java |    1 -
 .../opcua/readwrite/SetTriggeringResponse.java     |    1 -
 .../plc4x/java/opcua/readwrite/SignatureData.java  |    1 -
 .../opcua/readwrite/SignedSoftwareCertificate.java |    1 -
 .../opcua/readwrite/StatusChangeNotification.java  |    1 -
 .../plc4x/java/opcua/readwrite/StatusResult.java   |    1 -
 .../plc4x/java/opcua/readwrite/StructureField.java |   16 +-
 .../readwrite/SubscriptionAcknowledgement.java     |    1 -
 .../readwrite/SubscriptionDiagnosticsDataType.java |   16 +-
 .../java/opcua/readwrite/TimeZoneDataType.java     |   15 +-
 .../plc4x/java/opcua/readwrite/TransferResult.java |    1 -
 .../readwrite/TransferSubscriptionsRequest.java    |   15 +-
 .../readwrite/TransferSubscriptionsResponse.java   |    1 -
 .../TranslateBrowsePathsToNodeIdsRequest.java      |    1 -
 .../TranslateBrowsePathsToNodeIdsResponse.java     |    1 -
 .../java/opcua/readwrite/TrustListDataType.java    |    1 -
 .../opcua/readwrite/UnregisterNodesRequest.java    |    1 -
 .../opcua/readwrite/UnregisterNodesResponse.java   |    1 -
 .../opcua/readwrite/UnsignedRationalNumber.java    |    1 -
 .../java/opcua/readwrite/UserIdentityToken.java    |    1 -
 .../opcua/readwrite/UserNameIdentityToken.java     |    1 -
 .../java/opcua/readwrite/UserTokenPolicy.java      |    1 -
 .../apache/plc4x/java/opcua/readwrite/Variant.java |    6 +-
 .../plc4x/java/opcua/readwrite/VariantBoolean.java |    4 +-
 .../plc4x/java/opcua/readwrite/VariantByte.java    |    4 +-
 .../java/opcua/readwrite/VariantByteString.java    |    4 +-
 .../java/opcua/readwrite/VariantDataValue.java     |    4 +-
 .../java/opcua/readwrite/VariantDateTime.java      |    4 +-
 .../opcua/readwrite/VariantDiagnosticInfo.java     |    4 +-
 .../plc4x/java/opcua/readwrite/VariantDouble.java  |    4 +-
 .../opcua/readwrite/VariantExpandedNodeId.java     |    4 +-
 .../opcua/readwrite/VariantExtensionObject.java    |    4 +-
 .../plc4x/java/opcua/readwrite/VariantFloat.java   |    4 +-
 .../plc4x/java/opcua/readwrite/VariantGuid.java    |    4 +-
 .../plc4x/java/opcua/readwrite/VariantInt16.java   |    4 +-
 .../plc4x/java/opcua/readwrite/VariantInt32.java   |    4 +-
 .../plc4x/java/opcua/readwrite/VariantInt64.java   |    4 +-
 .../java/opcua/readwrite/VariantLocalizedText.java |    4 +-
 .../plc4x/java/opcua/readwrite/VariantNodeId.java  |    4 +-
 .../java/opcua/readwrite/VariantQualifiedName.java |    4 +-
 .../plc4x/java/opcua/readwrite/VariantSByte.java   |    4 +-
 .../java/opcua/readwrite/VariantStatusCode.java    |    4 +-
 .../plc4x/java/opcua/readwrite/VariantString.java  |    4 +-
 .../plc4x/java/opcua/readwrite/VariantUInt16.java  |    4 +-
 .../plc4x/java/opcua/readwrite/VariantUInt32.java  |    4 +-
 .../plc4x/java/opcua/readwrite/VariantUInt64.java  |    4 +-
 .../plc4x/java/opcua/readwrite/VariantVariant.java |    4 +-
 .../java/opcua/readwrite/VariantXmlElement.java    |    4 +-
 .../java/opcua/readwrite/ViewDescription.java      |    1 -
 .../plc4x/java/opcua/readwrite/WriteRequest.java   |    1 -
 .../plc4x/java/opcua/readwrite/WriteResponse.java  |    1 -
 .../plc4x/java/opcua/readwrite/WriteValue.java     |    1 -
 .../java/opcua/readwrite/X509IdentityToken.java    |    1 -
 .../apache/plc4x/java/opcua/readwrite/XVType.java  |    1 -
 .../java/opcua/context/EncryptionHandler.java      |    2 +-
 .../plc4x/java/opcua/context/SecureChannel.java    |   51 +-
 .../java/opcua/protocol/OpcuaProtocolLogic.java    |   12 +-
 .../opcua/protocol/OpcuaSubscriptionHandle.java    |    9 +-
 ...licationCommunicationStartAcknowledgeBlock.java |  218 ----
 ...onCommunicationStartAcknowledgeBlockCellId.java |  151 ---
 ...ommunicationStartAcknowledgeBlockChannelId.java |  154 ---
 ...CommunicationStartAcknowledgeBlockClientId.java |  151 ---
 ...icationStartAcknowledgeBlockControllerName.java |  156 ---
 ...tartAcknowledgeBlockControllerSerialNumber.java |  160 ---
 ...tAcknowledgeBlockControllerSoftwareVersion.java |  167 ---
 ...tartAcknowledgeBlockLinkingHandlingSupport.java |  172 ---
 ...onStartAcknowledgeBlockOpenProtocolVersion.java |  160 ---
 ...nCommunicationStartAcknowledgeBlockRbuType.java |  150 ---
 ...StartAcknowledgeBlockSequenceNumberSupport.java |  172 ---
 ...ommunicationStartAcknowledgeBlockStationId.java |  150 ---
 ...municationStartAcknowledgeBlockStationName.java |  154 ---
 ...unicationStartAcknowledgeBlockSupplierCode.java |  154 ---
 ...nicationStartAcknowledgeBlockSystemSubtype.java |  155 ---
 ...mmunicationStartAcknowledgeBlockSystemType.java |  150 ---
 ...onStartAcknowledgeBlockToolSoftwareVersion.java |  160 ---
 .../java/openprotocol/readwrite/MidTypes.java      |   74 --
 .../readwrite/OpenProtocolMessage.java             |  147 ++-
 ...nProtocolMessageApplicationCommandAccepted.java |  128 ++-
 ...ocolMessageApplicationCommandAcceptedRev1.java} |  106 +-
 ...OpenProtocolMessageApplicationCommandError.java |  159 +--
 ...rotocolMessageApplicationCommandErrorRev1.java} |  106 +-
 ...otocolMessageApplicationCommunicationStart.java |   51 +-
 ...geApplicationCommunicationStartAcknowledge.java |  159 +--
 ...plicationCommunicationStartAcknowledgeRev1.java |  302 +++++
 ...plicationCommunicationStartAcknowledgeRev2.java |  350 ++++++
 ...plicationCommunicationStartAcknowledgeRev3.java |  515 +++++++++
 ...plicationCommunicationStartAcknowledgeRev4.java |  612 ++++++++++
 ...plicationCommunicationStartAcknowledgeRev5.java |  708 ++++++++++++
 ...plicationCommunicationStartAcknowledgeRev6.java |  961 ++++++++++++++++
 ...rotocolMessageApplicationCommunicationStop.java |   51 +-
 ...otocolMessageApplicationGenericDataRequest.java |  204 ++--
 ...lMessageApplicationGenericDataRequestRev1.java} |  130 +--
 ...tocolMessageApplicationGenericSubscription.java |  205 ++--
 ...MessageApplicationGenericSubscriptionRev1.java} |  130 +--
 ...otocolMessageApplicationGenericUnsubscribe.java |  205 ++--
 ...lMessageApplicationGenericUnsubscribeRev1.java} |  128 +--
 .../readwrite/OpenProtocolRevision.java            |   88 --
 .../java/plc4x/readwrite/Plc4xConnectRequest.java  |    1 -
 .../java/plc4x/readwrite/Plc4xConnectResponse.java |    1 -
 .../java/plc4x/readwrite/Plc4xReadRequest.java     |    1 -
 .../java/plc4x/readwrite/Plc4xReadResponse.java    |    1 -
 .../java/plc4x/readwrite/Plc4xWriteRequest.java    |    1 -
 .../java/plc4x/readwrite/Plc4xWriteResponse.java   |    1 -
 .../java/profinet/readwrite/DceRpc_Packet.java     |   21 +-
 .../readwrite/Ethernet_FramePayload_IPv4.java      |    1 -
 .../readwrite/Ethernet_FramePayload_PnDcp.java     |    1 -
 .../Ethernet_FramePayload_VirtualLan.java          |    1 -
 .../profinet/readwrite/PcDcp_Pdu_DelayReq.java     |   54 +-
 .../PnDcp_Block_DevicePropertiesAliasName.java     |   26 +-
 .../PnDcp_Block_DevicePropertiesDeviceId.java      |   15 +-
 ...PnDcp_Block_DevicePropertiesDeviceInstance.java |   14 +-
 .../PnDcp_Block_DevicePropertiesDeviceOptions.java |   27 +-
 .../PnDcp_Block_DevicePropertiesDeviceRole.java    |   30 +-
 .../PnDcp_Block_DevicePropertiesDeviceVendor.java  |   26 +-
 .../PnDcp_Block_DevicePropertiesNameOfStation.java |   26 +-
 .../readwrite/PnDcp_Block_IpMacAddress.java        |   14 +-
 .../readwrite/PnDcp_Block_IpParameter.java         |   32 +-
 .../profinet/readwrite/PnDcp_Pdu_IdentifyReq.java  |   31 +-
 .../profinet/readwrite/PnDcp_Pdu_IdentifyRes.java  |   38 +-
 .../readwrite/PnDcp_Pdu_RealTimeCyclic.java        |   38 +-
 .../java/profinet/readwrite/PnDcp_ServiceType.java |   15 +-
 .../readwrite/PnIoCm_Block_AlarmCrReq.java         |   13 +-
 .../readwrite/PnIoCm_Block_AlarmCrRes.java         |    1 -
 .../profinet/readwrite/PnIoCm_Block_ArReq.java     |   21 +-
 .../profinet/readwrite/PnIoCm_Block_ArRes.java     |    1 -
 .../PnIoCm_Block_ExpectedSubmoduleReq.java         |    1 -
 .../profinet/readwrite/PnIoCm_Block_IoCrReq.java   |   21 +-
 .../profinet/readwrite/PnIoCm_Block_IoCrRes.java   |    1 -
 .../readwrite/PnIoCm_Block_ModuleDiff.java         |    1 -
 .../java/profinet/readwrite/PnIoCm_Packet_Rej.java |    1 -
 .../java/profinet/readwrite/PnIoCm_Packet_Req.java |    1 -
 .../java/profinet/readwrite/PnIoCm_Packet_Res.java |    1 -
 .../java/profinet/readwrite/PnIoCm_Submodule.java  |    8 +-
 .../PnIoCm_Submodule_InputAndOutputData.java       |    1 -
 .../s7/readwrite/AlarmMessageObjectQueryType.java  |    8 +-
 .../apache/plc4x/java/s7/readwrite/COTPPacket.java |   16 +-
 .../s7/readwrite/COTPPacketConnectionRequest.java  |   24 +-
 .../s7/readwrite/COTPPacketConnectionResponse.java |   24 +-
 .../plc4x/java/s7/readwrite/COTPPacketData.java    |   25 +-
 .../s7/readwrite/COTPPacketDisconnectRequest.java  |   24 +-
 .../s7/readwrite/COTPPacketDisconnectResponse.java |   23 +-
 .../java/s7/readwrite/COTPPacketTpduError.java     |   22 +-
 .../plc4x/java/s7/readwrite/COTPParameter.java     |   11 +-
 .../java/s7/readwrite/COTPParameterCalledTsap.java |   20 +-
 .../s7/readwrite/COTPParameterCallingTsap.java     |   21 +-
 .../java/s7/readwrite/COTPParameterChecksum.java   |   20 +-
 ...TPParameterDisconnectAdditionalInformation.java |   20 +-
 .../java/s7/readwrite/COTPParameterTpduSize.java   |   20 +-
 .../plc4x/java/s7/readwrite/S7AddressAny.java      |   15 +-
 .../apache/plc4x/java/s7/readwrite/S7Message.java  |   20 +-
 .../java/s7/readwrite/S7MessageObjectRequest.java  |   28 +-
 .../java/s7/readwrite/S7MessageObjectResponse.java |   14 +-
 .../plc4x/java/s7/readwrite/S7MessageResponse.java |    1 -
 .../java/s7/readwrite/S7MessageResponseData.java   |    1 -
 .../s7/readwrite/S7ParameterModeTransition.java    |   15 +-
 .../s7/readwrite/S7ParameterReadVarRequest.java    |    1 -
 .../s7/readwrite/S7ParameterReadVarResponse.java   |    1 -
 .../readwrite/S7ParameterSetupCommunication.java   |   15 +-
 .../java/s7/readwrite/S7ParameterUserData.java     |    1 -
 .../S7ParameterUserDataItemCPUFunctions.java       |   15 +-
 .../s7/readwrite/S7ParameterWriteVarRequest.java   |    1 -
 .../s7/readwrite/S7ParameterWriteVarResponse.java  |    1 -
 .../apache/plc4x/java/s7/readwrite/S7Payload.java  |   11 +-
 .../plc4x/java/s7/readwrite/S7PayloadAlarm8.java   |    1 -
 .../java/s7/readwrite/S7PayloadAlarmAckInd.java    |    1 -
 .../plc4x/java/s7/readwrite/S7PayloadAlarmS.java   |    1 -
 .../plc4x/java/s7/readwrite/S7PayloadAlarmSC.java  |    1 -
 .../plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java  |    1 -
 .../s7/readwrite/S7PayloadDiagnosticMessage.java   |    1 -
 .../plc4x/java/s7/readwrite/S7PayloadNotify.java   |    1 -
 .../plc4x/java/s7/readwrite/S7PayloadNotify8.java  |    1 -
 .../s7/readwrite/S7PayloadReadVarResponse.java     |   22 +-
 .../plc4x/java/s7/readwrite/S7PayloadUserData.java |   20 +-
 .../S7PayloadUserDataItemCpuFunctionAlarmAck.java  |    1 -
 ...oadUserDataItemCpuFunctionAlarmAckResponse.java |    1 -
 ...S7PayloadUserDataItemCpuFunctionAlarmQuery.java |   27 +-
 ...dUserDataItemCpuFunctionAlarmQueryResponse.java |   16 +-
 ...loadUserDataItemCpuFunctionMsgSubscription.java |   21 +-
 ...temCpuFunctionMsgSubscriptionAlarmResponse.java |    1 -
 ...aItemCpuFunctionMsgSubscriptionSysResponse.java |    1 -
 ...yloadUserDataItemCpuFunctionReadSzlRequest.java |    1 -
 ...loadUserDataItemCpuFunctionReadSzlResponse.java |    1 -
 .../s7/readwrite/S7PayloadWriteVarRequest.java     |   22 +-
 .../s7/readwrite/S7PayloadWriteVarResponse.java    |   22 +-
 .../S7VarRequestParameterItemAddress.java          |    1 -
 .../apache/plc4x/java/s7/readwrite/TPKTPacket.java |    5 +-
 .../optimizer/DefaultS7MessageProcessor.java       |    6 +-
 .../java/s7/readwrite/optimizer/S7Optimizer.java   |    6 +-
 .../s7/readwrite/protocol/S7ProtocolLogic.java     |   25 +-
 plc4j/drivers/s7/src/test/java/S7IoTest.java       |    7 +-
 plc4j/pom.xml                                      |    2 +-
 .../java/plc4x/readwrite/Plc4xConnectRequest.java  |    1 -
 .../java/plc4x/readwrite/Plc4xConnectResponse.java |    1 -
 .../java/plc4x/readwrite/Plc4xReadRequest.java     |    1 -
 .../java/plc4x/readwrite/Plc4xReadResponse.java    |    1 -
 .../java/plc4x/readwrite/Plc4xWriteRequest.java    |    1 -
 .../java/plc4x/readwrite/Plc4xWriteResponse.java   |    1 -
 .../java/socketcan/readwrite/SocketCANFrame.java   |   13 +-
 .../server/s7/protocol/S7Step7ServerAdapter.java   |   18 +-
 .../protocols/openprotocol/open-protocol.mspec     |  280 +++--
 .../openprotocol/ParserSerializerTestsuite.xml     |   92 +-
 .../java/df1/readwrite/DF1SymbolMessageFrame.java  |    1 -
 .../df1/readwrite/DF1UnprotectedReadRequest.java   |    1 -
 .../df1/readwrite/DF1UnprotectedReadResponse.java  |    1 -
 1956 files changed, 7037 insertions(+), 10643 deletions(-)

diff --git a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
index 398d1bcbef..fe7d700b26 100644
--- a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
+++ b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -191,32 +191,35 @@ public abstract class BaseFreemarkerLanguageTemplateHelper implements Freemarker
      * @return Map mapping discriminator names to types.
      */
     public Map<String, TypeReference> getDiscriminatorTypes() {
+        return getDiscriminatorTypes(thisType);
+    }
+    public Map<String, TypeReference> getDiscriminatorTypes(TypeDefinition type) {
         // Get the parent type (Which contains the typeSwitch field)
         SwitchField switchField = null;
         Function<String, TypeReference> typeRefRetriever = null;
-        if (thisType.isDiscriminatedComplexTypeDefinition()) {
-            DiscriminatedComplexTypeDefinition discriminatedComplexTypeDefinition = thisType.asDiscriminatedComplexTypeDefinition().orElseThrow();
+        if (type.isDiscriminatedComplexTypeDefinition()) {
+            DiscriminatedComplexTypeDefinition discriminatedComplexTypeDefinition = type.asDiscriminatedComplexTypeDefinition().orElseThrow();
             switchField = discriminatedComplexTypeDefinition.getSwitchField().orElse(null);
             typeRefRetriever = propertyName -> discriminatedComplexTypeDefinition.getTypeReferenceForProperty(propertyName).orElse(null);
             // Please forgive us, we didn't know what we were doing.
             if(switchField == null) {
-                ComplexTypeDefinition parentType = thisType.asDiscriminatedComplexTypeDefinition().orElseThrow().getParentType().orElseThrow();
+                ComplexTypeDefinition parentType = type.asDiscriminatedComplexTypeDefinition().orElseThrow().getParentType().orElseThrow();
                 switchField = parentType.getSwitchField().orElse(null);
                 typeRefRetriever = propertyName -> parentType.getTypeReferenceForProperty(propertyName).orElse(null);
             }
-        } else if (thisType.isDataIoTypeDefinition()) {
-            final DefaultDataIoTypeDefinition dataIoTypeDefinition = (DefaultDataIoTypeDefinition) this.thisType;
+        } else if (type.isDataIoTypeDefinition()) {
+            final DefaultDataIoTypeDefinition dataIoTypeDefinition = (DefaultDataIoTypeDefinition) type;
             switchField = dataIoTypeDefinition.getSwitchField().orElseThrow();
-            typeRefRetriever = propertyName -> thisType.getParserArguments()
+            typeRefRetriever = propertyName -> type.getParserArguments()
                 .orElse(Collections.emptyList())
                 .stream()
                 .filter(argument -> argument.getName().equals(propertyName))
                 .findFirst()
                 .map(Argument::getType)
                 .orElse(null);
-        } else if (thisType.isComplexTypeDefinition()) {
-            switchField = ((ComplexTypeDefinition) thisType).getSwitchField().orElse(null);
-            typeRefRetriever = propertyName -> ((ComplexTypeDefinition) thisType).getTypeReferenceForProperty(propertyName).orElse(null);
+        } else if (type.isComplexTypeDefinition()) {
+            switchField = ((ComplexTypeDefinition) type).getSwitchField().orElse(null);
+            typeRefRetriever = propertyName -> ((ComplexTypeDefinition) type).getTypeReferenceForProperty(propertyName).orElse(null);
         }
         // Get the typeSwitch field from that.
         if (switchField == null) {
diff --git a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
index cf751426fd..cde7c11651 100644
--- a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
+++ b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageOutput.java
@@ -47,7 +47,13 @@ public class JavaLanguageOutput extends FreemarkerLanguageOutput {
 
     @Override
     public Set<String> supportedOptions() {
-        return Collections.singleton("package");
+        return new HashSet<>(Arrays.asList(
+            // Overrides the package name generated.
+            "package",
+            // Generates additional properties to save parser arguments.
+            "generate-properties-for-parser-arguments",
+            // Generates additional properties to save values of reserved fields for the case that the value differs from the expected value.
+            "generate-properties-for-reserved-fields"));
     }
 
     @Override
diff --git a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index fc44e19a82..f45cdf9932 100644
--- a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -1259,4 +1259,12 @@ public class JavaLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHe
         return baseTypeReference.isPresent() && baseTypeReference.get().isIntegerTypeReference() && baseTypeReference.get().asIntegerTypeReference().orElseThrow().getSizeInBits() >= 32;
     }
 
+    public boolean isGeneratePropertiesForParserArguments() {
+        return options.getOrDefault("generate-properties-for-parser-arguments", "false").equals("true");
+    }
+
+    public boolean isGeneratePropertiesForReservedFields() {
+        return options.getOrDefault("generate-properties-for-reserved-fields", "false").equals("true");
+    }
+
 }
diff --git a/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
index eebc88c352..a0ea49881c 100644
--- a/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
+++ b/code-generation/language-java/src/main/resources/templates/java/complex-type-template.java.ftlh
@@ -80,7 +80,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
     <#list discriminatedChildType.getDiscriminatorMap() as discriminatorName, discriminatorValue>
     <#-- If the discriminator name matches that of another field, suppress the methods generation -->
         <#if !discriminatedChildType.isNonDiscriminatorField(discriminatorName)><#--&& !discriminatedChildType.isParserArgument(discriminatorName)-->
-            <#assign discriminatorType = helper.getDiscriminatorTypes()[discriminatorName]>
+            <#assign discriminatorType = helper.getDiscriminatorTypes(discriminatedChildType.parentType.orElseThrow())[discriminatorName]>
     public ${helper.getLanguageTypeNameForTypeReference(discriminatorType)} get${discriminatorName?cap_first}() {
             <#if discriminatorValue?? && !helper.isWildcard(discriminatorValue)>
                 <#if discriminatorType.isEnumTypeReference()>
@@ -126,57 +126,68 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
     protected final ${helper.getLanguageTypeNameForTypeReference(field.type, !field.isOptionalField())} ${field.name};
     </#list>
 </#if>
-<#if parserArguments?has_content>
-  <#assign filteredParserArguments=parserArguments?filter(arg -> !type.isDiscriminatorField(arg.name) && !type.getPropertyFieldFromThisOrParentByName(arg.name).isPresent())>
-</#if>
-<#if filteredParserArguments?has_content>
+<#-- This list contains a list of parser arguments, that are not being used as variables for discriminator expressions in typeSwitches -->
+<#if helper.isGeneratePropertiesForParserArguments()>
+    <#if parserArguments?has_content>
+        <#assign filteredParserArguments=parserArguments?filter(arg -> !type.isDiscriminatorField(arg.name) && !type.getPropertyFieldFromThisOrParentByName(arg.name).isPresent())>
+    </#if>
+
+    <#if filteredParserArguments?has_content>
 
     // Arguments.
-    <#list filteredParserArguments as parserArgument>
+        <#list filteredParserArguments as parserArgument>
     protected final ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} ${parserArgument.name};
-    </#list>
+        </#list>
+    </#if>
 </#if>
-<#assign reservedFields=type.getFields()?filter(f->f.isReservedField())>
-<#if reservedFields?has_content>
+<#if helper.isGeneratePropertiesForReservedFields()>
+    <#assign reservedFields=type.getFields()?filter(f->f.isReservedField())>
+    <#if reservedFields?has_content>
     // Reserved Fields
-    <#list reservedFields as reservedField>
+        <#list reservedFields as reservedField>
     private ${helper.getLanguageTypeNameForTypeReference(reservedField.asReservedField().orElseThrow().type, false)} reservedField${reservedField?index};
-    </#list>
+        </#list>
+    </#if>
 </#if>
 
     <#-- getAllPropertyFields() returns not only the property fields of this type but also of it's parents -->
     <@compress single_line=true>
     public ${type.name}(
+        <#assign needsSeparator = false>
         <#list type.getAllPropertyFields() as field>
+            <#assign needsSeparator = true>
             ${helper.getLanguageTypeNameForField(field)} ${field.name}
             <#sep>, </#sep>
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.getAllPropertyFields()?has_content>, </#if>
-            <#list filteredParserArguments as parserArgument>
-                ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} ${parserArgument.name}
-                <#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if needsSeparator>, </#if>
+                <#list filteredParserArguments as parserArgument>
+                    ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)} ${parserArgument.name}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
         ) {
     </...@compress>
 
     <@compress single_line=true>
         super(
+        <#assign needsSeparator = false>
         <#if type.parentPropertyFields?has_content>
             <#list type.parentPropertyFields as field>
-                ${field.name}
-                <#sep>, </#sep>
+                <#assign needsSeparator = true>
+                ${field.name}<#sep>, </#sep>
             </#list>
         </#if>
-        <#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
-            <#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
-            <#if filteredParentParserArguments?has_content>
-                <#if type.parentPropertyFields?has_content>, </#if>
-                <#list filteredParentParserArguments as parserArgument>
-                    ${parserArgument.name}
-                    <#sep>, </#sep>
-                </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
+                <#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
+                <#if filteredParentParserArguments?has_content>
+                    <#if needsSeparator>, </#if>
+                    <#list filteredParentParserArguments as parserArgument>
+                        ${parserArgument.name}<#sep>, </#sep>
+                    </#list>
+                </#if>
             </#if>
         </#if>
         );
@@ -185,10 +196,12 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
 <#list type.propertyFields as field>
         this.${field.name} = ${field.name};
 </#list>
-<#if filteredParserArguments?has_content>
-    <#list filteredParserArguments as parserArgument>
-        this.${parserArgument.name} = ${parserArgument.name};
-    </#list>
+<#if helper.isGeneratePropertiesForParserArguments()>
+    <#if filteredParserArguments?has_content>
+        <#list filteredParserArguments as parserArgument>
+            this.${parserArgument.name} = ${parserArgument.name};
+        </#list>
+    </#if>
 </#if>
     }
 
@@ -328,7 +341,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
                         <#elseif optionalField.type.isDataIoTypeReference()>
                             writeOptionalField("${optionalField.name}", ${optionalField.name}, new DataWriterDataIoDefault(writeBuffer, (wb, val) -> ${optionalField.type.asComplexTypeReference().orElseThrow().name}.staticSerialize(wb, val<#if optionalField.type.asComplexTypeReference().orElseThrow().params?has_content>, <#list optionalField.type.asComplexTypeReference().orElseThrow().params.orElseThrow() as param>${helper.toParseExpression(optionalField, helper.anyTypeReference, param, p [...]
                         <#else>
-                            writeOptionalField("${optionalField.name}", ${optionalField.name}, ${helper.getDataWriterCall(typedField.type, optionalField.name)}<#if optionalField.conditionExpression.present>, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}</#if>${helper.getFieldOptions(typedField, parserArguments)});
+                            writeOptionalField("${optionalField.name}", ${optionalField.name}, ${helper.getDataWriterCall(typedField.type, optionalField.name)}<#if helper.isGeneratePropertiesForParserArguments() && optionalField.conditionExpression.present>, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}</#if>${helper.getFieldOptions(typedField, parserArguments)});
                         </#if>
                         <#break>
                     <#case "padding">
@@ -343,7 +356,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
                         <#assign typedField = field.asTypedField().orElseThrow()>
 
                         // Reserved Field (reserved)
-                        writeReservedField("reserved", reservedField${reservedFieldIndex}!=null?reservedField${reservedFieldIndex}:${helper.getReservedValue(reservedField)}, ${helper.getDataWriterCall(typedField.type, "reserved")}${helper.getFieldOptions(typedField, parserArguments)});<#assign reservedFieldIndex=reservedFieldIndex+1>
+                        writeReservedField("reserved", <#if helper.isGeneratePropertiesForReservedFields()>reservedField${reservedFieldIndex}!=null?reservedField${reservedFieldIndex}:</#if>${helper.getReservedValue(reservedField)}, ${helper.getDataWriterCall(typedField.type, "reserved")}${helper.getFieldOptions(typedField, parserArguments)});<#assign reservedFieldIndex=reservedFieldIndex+1>
                         <#break>
                     <#case "simple">
                         <#assign simpleField = field.asSimpleField().orElseThrow()>
@@ -729,8 +742,6 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
                                     true
                                 <#else>
                                     <#assign discriminatorExpression=switchField.discriminatorExpressions[discriminatorValueTerm?index].asLiteral().orElseThrow().asVariableLiteral().orElseThrow()>
-                                    <#--${helper.info("discriminator-name {}", discriminatorExpression.discriminatorName)}
-                                    ${helper.info("discriminator-types {}", helper.getDiscriminatorTypes())}-->
                                     <#assign discriminatorType=helper.getDiscriminatorTypes()[discriminatorExpression.discriminatorName]>
                                     EvaluationHelper.equals(
                                     ${helper.toParseExpression(switchField, discriminatorType, discriminatorExpression, parserArguments)},
@@ -792,20 +803,32 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
     // Create the instance
     <#if type.isDiscriminatedChildTypeDefinition()>
         return new ${type.name}BuilderImpl(
+        <#assign needsSeparator = false>
         <#list type.propertyFields as field>
+            <#assign needsSeparator = true>
             ${field.name}<#sep>, </#sep>
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.propertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>${arg.name}<#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if needsSeparator><#assign needsSeparator = false>, </#if>
+                <#list filteredParserArguments as arg>
+                    <#assign needsSeparator = true>
+                    ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
+        </#if>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#if reservedFields?has_content>
+                <#if needsSeparator><#assign needsSeparator = false>, </#if>
+                <#list reservedFields as reservedField>
+                    <#assign needsSeparator = true>
+                    reservedField${reservedField?index}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
-        <#if (type.propertyFields?has_content || filteredParentParserArguments?has_content) && reservedFields?has_content>,</#if>
-        <#list reservedFields as reservedField>
-            reservedField${reservedField?index}<#sep>, </#sep>
-        </#list>
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
-            , builder
+            <#if needsSeparator>, </#if>
+            builder
         </#if>
         );
     <#elseif type.isDiscriminatedParentTypeDefinition()>
@@ -813,16 +836,20 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         <#list type.propertyFields as field>
             ${field.name}<#sep>, </#sep>
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.propertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>
-                ${arg.name}<#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if type.propertyFields?has_content>, </#if>
+                <#list filteredParserArguments as arg>
+                    ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
         );
-        <#list reservedFields as reservedField>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#list reservedFields as reservedField>
         _${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
-        </#list>
+            </#list>
+        </#if>
         return _${type.name?uncap_first};
     <#else>
         ${type.name} _${type.name?uncap_first};
@@ -830,16 +857,20 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         <#list type.propertyFields as field>
             ${field.name}<#sep>, </#sep>
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.propertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>
-                ${arg.name}<#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if type.propertyFields?has_content>, </#if>
+                <#list filteredParserArguments as arg>
+                    ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
         );
-        <#list reservedFields as reservedField>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#list reservedFields as reservedField>
             _${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
-        </#list>
+            </#list>
+        </#if>
         return _${type.name?uncap_first};
     </#if>
     }
@@ -847,21 +878,28 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
     <#if type.isDiscriminatedParentTypeDefinition()>
         public interface ${type.name}Builder {
             ${type.name} build(
+        <#assign needsSeparator = false>
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
             <#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields as field>
+                <#assign needsSeparator = true>
                 ${helper.getLanguageTypeNameForField(field)} ${field.name}<#sep>, </#sep>
             </#list>
-            <#if type.propertyFields?has_content || filteredParserArguments?has_content>,</#if>
         </#if>
-        <#list type.propertyFields as field>
-            ${helper.getLanguageTypeNameForField(field)} ${field.name}<#sep>, </#sep>
-            </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.propertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>
-                ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
+        <#if type.propertyFields?has_content>
+            <#if needsSeparator><#assign needsSeparator = false>, </#if>
+            <#list type.propertyFields as field>
+                <#assign needsSeparator = true>
+                ${helper.getLanguageTypeNameForField(field)} ${field.name}<#sep>, </#sep>
             </#list>
         </#if>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if needsSeparator>, </#if>
+                <#list filteredParserArguments as arg>
+                    ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
+        </#if>
         );
         }
 
@@ -873,93 +911,128 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
         private final ${helper.getLanguageTypeNameForField(field)} ${field.name};
             </#list>
         </#if>
-        <#if filteredParserArguments?has_content>
-            <#list filteredParserArguments as arg>
-        private final ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name};
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#list filteredParserArguments as arg>
+            private final ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name};
+                </#list>
+            </#if>
+        </#if>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#list reservedFields as reservedField>
+            private final ${helper.getLanguageTypeNameForTypeReference(reservedField.asTypedField().orElseThrow().type, false)} reservedField${reservedField?index};
             </#list>
         </#if>
-        <#list reservedFields as reservedField>
-        private final ${helper.getLanguageTypeNameForTypeReference(reservedField.type, false)} reservedField${reservedField?index};
-        </#list>
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
         private final ${type.name}Builder builder;
         </#if>
 
         public ${type.name}BuilderImpl(
+        <#assign needsSeparator = false>
         <#list type.propertyFields as field>
+            <#assign needsSeparator = true>
             ${helper.getLanguageTypeNameForField(field)} ${field.name}<#sep>, </#sep>
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.propertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>
-                ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#if needsSeparator><#assign needsSeparator = false>, </#if>
+                <#list filteredParserArguments as arg>
+                    <#assign needsSeparator = true>
+                    ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
+        </#if>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#if reservedFields?has_content>
+                <#if needsSeparator><#assign needsSeparator = false>, </#if>
+                <#list reservedFields as reservedField>
+                    <#assign needsSeparator = true>
+                    ${helper.getLanguageTypeNameForTypeReference(reservedField.asTypedField().orElseThrow().type, false)} reservedField${reservedField?index}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
-        <#if (type.propertyFields?has_content || filteredParentParserArguments?has_content) && reservedFields?has_content>,</#if>
-        <#list reservedFields as reservedField>
-            ${helper.getLanguageTypeNameForTypeReference(reservedField.type, false)} reservedField${reservedField?index}<#sep>, </#sep>
-        </#list>
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
-            , ${type.name}Builder builder
+            <#if needsSeparator><#assign needsSeparator = false>, </#if>
+            ${type.name}Builder builder
         </#if>
         ) {
         <#list type.propertyFields as field>
             this.${field.name} = ${field.name};
         </#list>
-        <#if filteredParserArguments?has_content>
-            <#list filteredParserArguments as arg>
-            this.${arg.name} = ${arg.name};
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParserArguments?has_content>
+                <#list filteredParserArguments as arg>
+                    this.${arg.name} = ${arg.name};
+                </#list>
+            </#if>
+        </#if>
+        <#if helper.isGeneratePropertiesForReservedFields()>
+            <#list reservedFields as reservedField>
+                this.reservedField${reservedField?index} = reservedField${reservedField?index};
             </#list>
         </#if>
-        <#list reservedFields as reservedField>
-            this.reservedField${reservedField?index} = reservedField${reservedField?index};
-        </#list>
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
             this.builder = builder;
         </#if>
         }
 
         public ${type.name} build(
+        <#assign needsSeparator = false>
         <#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields as field>
+            <#assign needsSeparator = true>
             ${helper.getLanguageTypeNameForField(field)} ${field.name}<#sep>, </#sep>
         </#list>
-        <#if filteredParentParserArguments?has_content>
-            <#if type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().propertyFields?has_content>, </#if>
-            <#list filteredParentParserArguments as arg>
-                ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
-            </#list>
+        <#if helper.isGeneratePropertiesForParserArguments()>
+            <#if filteredParentParserArguments?has_content>
+                <#if needsSeparator>, </#if>
+                <#list filteredParentParserArguments as arg>
+                    ${helper.getLanguageTypeNameForTypeReference(arg.type)} ${arg.name}<#sep>, </#sep>
+                </#list>
+            </#if>
         </#if>
         ) {
         <#if type.parentType.isPresent() && type.isDiscriminatedChildTypeDefinition() && type.isDiscriminatedParentTypeDefinition()>
             return builder.build(
+            <#assign needsSeparator = false>
             <#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields as field>
+                <#assign needsSeparator = true>
                 ${field.name}<#sep>, </#sep>
             </#list>
-            <#if type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields?has_content>, </#if>
-            <#list type.propertyFields as field>
-                ${field.name}<#sep>, </#sep>
-            </#list>
-            <#if filteredParentParserArguments?has_content>
-                <#if type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().allPropertyFields?has_content>, </#if>
-                <#list filteredParentParserArguments as arg>
-                    ${arg.name}<#sep>, </#sep>
+            <#if type.propertyFields?has_content>
+                <#if needsSeparator><#assign needsSeparator = false>, </#if>
+                <#list type.propertyFields as field>
+                    <#assign needsSeparator = true>
+                    ${field.name}<#sep>, </#sep>
                 </#list>
             </#if>
+            <#if helper.isGeneratePropertiesForParserArguments()>
+                <#if filteredParserArguments?has_content>
+                    <#if needsSeparator>, </#if>
+                    <#list filteredParserArguments as arg>
+                        ${arg.name}<#sep>, </#sep>
+                    </#list>
+                </#if>
+            </#if>
             );
         <#else>
             ${type.name} ${type.name?uncap_first} = new ${type.name}(
             <#list type.allPropertyFields as field>
                 ${field.name}<#sep>, </#sep>
             </#list>
-        <#if filteredParserArguments?has_content>
-            <#if type.allPropertyFields?has_content>, </#if>
-            <#list filteredParserArguments as arg>
-                ${arg.name}<#sep>, </#sep>
-            </#list>
-        </#if>);
-        <#list reservedFields as reservedField>
-            ${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
-        </#list>
+            <#if helper.isGeneratePropertiesForParserArguments()>
+                <#if filteredParserArguments?has_content>
+                    <#if type.allPropertyFields?has_content>, </#if>
+                    <#list filteredParserArguments as arg>
+                        ${arg.name}<#sep>, </#sep>
+                    </#list>
+                </#if>
+            </#if>
+            );
+            <#if helper.isGeneratePropertiesForReservedFields()>
+                <#list reservedFields as reservedField>
+                    ${type.name?uncap_first}.reservedField${reservedField?index} = reservedField${reservedField?index};
+                </#list>
+            </#if>
             return ${type.name?uncap_first};
         </#if>
         }
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
index 3114f2f9e5..8d19cae586 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
@@ -48,12 +48,10 @@ public class DefaultComplexTypeDefinition extends DefaultTypeDefinition implemen
 
     public Optional<List<Argument>> getAllParserArguments() {
         List<Argument> allArguments = new ArrayList<>();
-        getParentType()
-            .map(ComplexTypeDefinition::getParserArguments)
-            .map(arguments -> arguments.orElse(Collections.emptyList()))
-            .map(allArguments::addAll);
-        if (parserArguments != null) {
-            allArguments.addAll(parserArguments);
+        allArguments.addAll(getParserArguments().orElse(Collections.emptyList()));
+        if(getParentType().isPresent()) {
+            ComplexTypeDefinition parent = getParentType().get();
+            allArguments.addAll(parent.getAllParserArguments().orElse(Collections.emptyList()));
         }
         return Optional.of(allArguments);
     }
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 1337f3a0f1..dc60201601 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -196,13 +196,13 @@ func BACnetConfirmedServiceRequestParseWithBuffer(readBuffer utils.ReadBuffer, s
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY: // BACnetConfirmedServiceRequestReadProperty
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE: // BACnetConfirmedServiceRequestReadPropertyMultiple
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_RANGE: // BACnetConfirmedServiceRequestReadRange
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadRangeParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_WRITE_PROPERTY: // BACnetConfirmedServiceRequestWriteProperty
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE: // BACnetConfirmedServiceRequestWritePropertyMultiple
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL: // BACnetConfirmedServiceRequestDeviceCommunicationControl
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestDeviceCommunicationControlParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER: // BACnetConfirmedServiceRequestConfirmedPrivateTransfer
@@ -214,17 +214,17 @@ func BACnetConfirmedServiceRequestParseWithBuffer(readBuffer utils.ReadBuffer, s
 	case serviceChoice == BACnetConfirmedServiceChoice_VT_OPEN: // BACnetConfirmedServiceRequestVTOpen
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestVTOpenParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_VT_CLOSE: // BACnetConfirmedServiceRequestVTClose
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestVTCloseParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestVTCloseParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_VT_DATA: // BACnetConfirmedServiceRequestVTData
 		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestVTDataParseWithBuffer(readBuffer, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_AUTHENTICATE: // BACnetConfirmedServiceRequestAuthenticate
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_REQUEST_KEY: // BACnetConfirmedServiceRequestRequestKey
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL: // BACnetConfirmedServiceRequestReadPropertyConditional
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	case 0 == 0: // BACnetConfirmedServiceRequestUnknown
-		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestUnknownParseWithBuffer(readBuffer, serviceRequestLength, serviceRequestPayloadLength)
+		_childTemp, typeSwitchError = BACnetConfirmedServiceRequestUnknownParseWithBuffer(readBuffer, serviceRequestPayloadLength, serviceRequestLength)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [serviceChoice=%v]", serviceChoice)
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
index 433f7310b8..ecb0a8d749 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestAuthenticate) GetBytesOfRemovedService()
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestAuthenticate factory function for _BACnetConfirmedServiceRequestAuthenticate
-func NewBACnetConfirmedServiceRequestAuthenticate(bytesOfRemovedService []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestAuthenticate {
+func NewBACnetConfirmedServiceRequestAuthenticate(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestAuthenticate {
 	_result := &_BACnetConfirmedServiceRequestAuthenticate{
 		BytesOfRemovedService:          bytesOfRemovedService,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -130,11 +130,11 @@ func (m *_BACnetConfirmedServiceRequestAuthenticate) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestAuthenticateParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestAuthenticate, error) {
-	return BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestAuthenticateParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestAuthenticate, error) {
+	return BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestAuthenticate, error) {
+func BACnetConfirmedServiceRequestAuthenticateParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestAuthenticate, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestAuthenticate"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
index e98cdbdf09..6ca4e64d8b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) GetBytesOfRemove
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestReadPropertyConditional factory function for _BACnetConfirmedServiceRequestReadPropertyConditional
-func NewBACnetConfirmedServiceRequestReadPropertyConditional(bytesOfRemovedService []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestReadPropertyConditional {
+func NewBACnetConfirmedServiceRequestReadPropertyConditional(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadPropertyConditional {
 	_result := &_BACnetConfirmedServiceRequestReadPropertyConditional{
 		BytesOfRemovedService:          bytesOfRemovedService,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -130,11 +130,11 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyConditional) GetLengthInBytes
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestReadPropertyConditionalParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestReadPropertyConditional, error) {
-	return BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestReadPropertyConditionalParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestReadPropertyConditional, error) {
+	return BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestReadPropertyConditional, error) {
+func BACnetConfirmedServiceRequestReadPropertyConditionalParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestReadPropertyConditional, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestReadPropertyConditional"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index 1e7403291d..676a877fad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) GetData() []BACnetR
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestReadPropertyMultiple factory function for _BACnetConfirmedServiceRequestReadPropertyMultiple
-func NewBACnetConfirmedServiceRequestReadPropertyMultiple(data []BACnetReadAccessSpecification, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestReadPropertyMultiple {
+func NewBACnetConfirmedServiceRequestReadPropertyMultiple(data []BACnetReadAccessSpecification, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestReadPropertyMultiple {
 	_result := &_BACnetConfirmedServiceRequestReadPropertyMultiple{
 		Data:                           data,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -132,11 +132,11 @@ func (m *_BACnetConfirmedServiceRequestReadPropertyMultiple) GetLengthInBytes()
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestReadPropertyMultipleParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestReadPropertyMultiple, error) {
-	return BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestReadPropertyMultipleParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestReadPropertyMultiple, error) {
+	return BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestReadPropertyMultiple, error) {
+func BACnetConfirmedServiceRequestReadPropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestReadPropertyMultiple, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestReadPropertyMultiple"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
index 4f7480c264..77972f70fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestRequestKey) GetBytesOfRemovedService() []
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestRequestKey factory function for _BACnetConfirmedServiceRequestRequestKey
-func NewBACnetConfirmedServiceRequestRequestKey(bytesOfRemovedService []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestRequestKey {
+func NewBACnetConfirmedServiceRequestRequestKey(bytesOfRemovedService []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestRequestKey {
 	_result := &_BACnetConfirmedServiceRequestRequestKey{
 		BytesOfRemovedService:          bytesOfRemovedService,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -130,11 +130,11 @@ func (m *_BACnetConfirmedServiceRequestRequestKey) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestRequestKeyParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestRequestKey, error) {
-	return BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestRequestKeyParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestRequestKey, error) {
+	return BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestRequestKey, error) {
+func BACnetConfirmedServiceRequestRequestKeyParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestRequestKey, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestRequestKey"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
index 1ba84ec5d5..bfac4efca7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestUnknown) GetUnknownBytes() []byte {
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestUnknown factory function for _BACnetConfirmedServiceRequestUnknown
-func NewBACnetConfirmedServiceRequestUnknown(unknownBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestUnknown {
+func NewBACnetConfirmedServiceRequestUnknown(unknownBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestUnknown {
 	_result := &_BACnetConfirmedServiceRequestUnknown{
 		UnknownBytes:                   unknownBytes,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -130,11 +130,11 @@ func (m *_BACnetConfirmedServiceRequestUnknown) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestUnknownParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestUnknown, error) {
-	return BACnetConfirmedServiceRequestUnknownParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestUnknownParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestUnknown, error) {
+	return BACnetConfirmedServiceRequestUnknownParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestUnknownParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestUnknown, error) {
+func BACnetConfirmedServiceRequestUnknownParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestUnknown, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestUnknown"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index 2301af6a86..845cc389b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestVTClose) GetListOfRemoteVtSessionIdentifi
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestVTClose factory function for _BACnetConfirmedServiceRequestVTClose
-func NewBACnetConfirmedServiceRequestVTClose(listOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestVTClose {
+func NewBACnetConfirmedServiceRequestVTClose(listOfRemoteVtSessionIdentifiers []BACnetApplicationTagUnsignedInteger, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestVTClose {
 	_result := &_BACnetConfirmedServiceRequestVTClose{
 		ListOfRemoteVtSessionIdentifiers: listOfRemoteVtSessionIdentifiers,
 		_BACnetConfirmedServiceRequest:   NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -132,11 +132,11 @@ func (m *_BACnetConfirmedServiceRequestVTClose) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestVTCloseParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestVTClose, error) {
-	return BACnetConfirmedServiceRequestVTCloseParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestVTCloseParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestVTClose, error) {
+	return BACnetConfirmedServiceRequestVTCloseParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestVTCloseParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestVTClose, error) {
+func BACnetConfirmedServiceRequestVTCloseParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestVTClose, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestVTClose"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index fefe4f622c..3bda369534 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -87,7 +87,7 @@ func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) GetData() []BACnet
 ///////////////////////////////////////////////////////////
 
 // NewBACnetConfirmedServiceRequestWritePropertyMultiple factory function for _BACnetConfirmedServiceRequestWritePropertyMultiple
-func NewBACnetConfirmedServiceRequestWritePropertyMultiple(data []BACnetWriteAccessSpecification, serviceRequestLength uint32, serviceRequestPayloadLength uint32) *_BACnetConfirmedServiceRequestWritePropertyMultiple {
+func NewBACnetConfirmedServiceRequestWritePropertyMultiple(data []BACnetWriteAccessSpecification, serviceRequestPayloadLength uint32, serviceRequestLength uint32) *_BACnetConfirmedServiceRequestWritePropertyMultiple {
 	_result := &_BACnetConfirmedServiceRequestWritePropertyMultiple{
 		Data:                           data,
 		_BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
@@ -132,11 +132,11 @@ func (m *_BACnetConfirmedServiceRequestWritePropertyMultiple) GetLengthInBytes()
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestWritePropertyMultipleParse(theBytes []byte, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestWritePropertyMultiple, error) {
-	return BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestLength, serviceRequestPayloadLength)
+func BACnetConfirmedServiceRequestWritePropertyMultipleParse(theBytes []byte, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestWritePropertyMultiple, error) {
+	return BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceRequestPayloadLength, serviceRequestLength)
 }
 
-func BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestLength uint32, serviceRequestPayloadLength uint32) (BACnetConfirmedServiceRequestWritePropertyMultiple, error) {
+func BACnetConfirmedServiceRequestWritePropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceRequestPayloadLength uint32, serviceRequestLength uint32) (BACnetConfirmedServiceRequestWritePropertyMultiple, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestWritePropertyMultiple"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
index f4006b5a0a..9927f65530 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
@@ -207,25 +207,25 @@ func BACnetContextTagParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgum
 	var typeSwitchError error
 	switch {
 	case dataType == BACnetDataType_NULL: // BACnetContextTagNull
-		_childTemp, typeSwitchError = BACnetContextTagNullParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagNullParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_BOOLEAN: // BACnetContextTagBoolean
-		_childTemp, typeSwitchError = BACnetContextTagBooleanParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagBooleanParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_UNSIGNED_INTEGER: // BACnetContextTagUnsignedInteger
-		_childTemp, typeSwitchError = BACnetContextTagUnsignedIntegerParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagUnsignedIntegerParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_SIGNED_INTEGER: // BACnetContextTagSignedInteger
-		_childTemp, typeSwitchError = BACnetContextTagSignedIntegerParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagSignedIntegerParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_REAL: // BACnetContextTagReal
 		_childTemp, typeSwitchError = BACnetContextTagRealParseWithBuffer(readBuffer, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_DOUBLE: // BACnetContextTagDouble
 		_childTemp, typeSwitchError = BACnetContextTagDoubleParseWithBuffer(readBuffer, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_OCTET_STRING: // BACnetContextTagOctetString
-		_childTemp, typeSwitchError = BACnetContextTagOctetStringParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagOctetStringParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_CHARACTER_STRING: // BACnetContextTagCharacterString
-		_childTemp, typeSwitchError = BACnetContextTagCharacterStringParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagCharacterStringParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_BIT_STRING: // BACnetContextTagBitString
-		_childTemp, typeSwitchError = BACnetContextTagBitStringParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagBitStringParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_ENUMERATED: // BACnetContextTagEnumerated
-		_childTemp, typeSwitchError = BACnetContextTagEnumeratedParseWithBuffer(readBuffer, tagNumberArgument, dataType, header)
+		_childTemp, typeSwitchError = BACnetContextTagEnumeratedParseWithBuffer(readBuffer, header, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_DATE: // BACnetContextTagDate
 		_childTemp, typeSwitchError = BACnetContextTagDateParseWithBuffer(readBuffer, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_TIME: // BACnetContextTagTime
@@ -233,7 +233,7 @@ func BACnetContextTagParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgum
 	case dataType == BACnetDataType_BACNET_OBJECT_IDENTIFIER: // BACnetContextTagObjectIdentifier
 		_childTemp, typeSwitchError = BACnetContextTagObjectIdentifierParseWithBuffer(readBuffer, tagNumberArgument, dataType)
 	case dataType == BACnetDataType_UNKNOWN: // BACnetContextTagUnknown
-		_childTemp, typeSwitchError = BACnetContextTagUnknownParseWithBuffer(readBuffer, tagNumberArgument, dataType, actualLength)
+		_childTemp, typeSwitchError = BACnetContextTagUnknownParseWithBuffer(readBuffer, actualLength, tagNumberArgument, dataType)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [dataType=%v]", dataType)
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
index 28a9f2f15f..55ff891160 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
@@ -126,11 +126,11 @@ func (m *_BACnetContextTagBitString) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagBitStringParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagBitString, error) {
-	return BACnetContextTagBitStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagBitStringParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagBitString, error) {
+	return BACnetContextTagBitStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagBitStringParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagBitString, error) {
+func BACnetContextTagBitStringParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagBitString, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagBitString"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
index de9967daae..08d1546351 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
@@ -154,11 +154,11 @@ func (m *_BACnetContextTagBoolean) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagBooleanParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagBoolean, error) {
-	return BACnetContextTagBooleanParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagBooleanParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagBoolean, error) {
+	return BACnetContextTagBooleanParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagBooleanParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagBoolean, error) {
+func BACnetContextTagBooleanParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagBoolean, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagBoolean"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
index 588a21f4cf..2bf00bcb4e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
@@ -143,11 +143,11 @@ func (m *_BACnetContextTagCharacterString) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagCharacterStringParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagCharacterString, error) {
-	return BACnetContextTagCharacterStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagCharacterStringParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagCharacterString, error) {
+	return BACnetContextTagCharacterStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagCharacterStringParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagCharacterString, error) {
+func BACnetContextTagCharacterStringParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagCharacterString, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagCharacterString"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
index a293329a3e..cd0729b560 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
@@ -143,11 +143,11 @@ func (m *_BACnetContextTagEnumerated) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagEnumeratedParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagEnumerated, error) {
-	return BACnetContextTagEnumeratedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagEnumeratedParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagEnumerated, error) {
+	return BACnetContextTagEnumeratedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagEnumeratedParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagEnumerated, error) {
+func BACnetContextTagEnumeratedParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagEnumerated, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagEnumerated"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
index f7d1ada689..baba462f09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
@@ -105,11 +105,11 @@ func (m *_BACnetContextTagNull) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagNullParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagNull, error) {
-	return BACnetContextTagNullParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagNullParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagNull, error) {
+	return BACnetContextTagNullParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagNullParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagNull, error) {
+func BACnetContextTagNullParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagNull, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagNull"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
index 34a1bd5f55..b79587043a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
@@ -126,11 +126,11 @@ func (m *_BACnetContextTagOctetString) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagOctetStringParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagOctetString, error) {
-	return BACnetContextTagOctetStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagOctetStringParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagOctetString, error) {
+	return BACnetContextTagOctetStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagOctetStringParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagOctetString, error) {
+func BACnetContextTagOctetStringParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagOctetString, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagOctetString"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
index 9b7d685bbf..a04aa347b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
@@ -143,11 +143,11 @@ func (m *_BACnetContextTagSignedInteger) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagSignedIntegerParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagSignedInteger, error) {
-	return BACnetContextTagSignedIntegerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagSignedIntegerParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagSignedInteger, error) {
+	return BACnetContextTagSignedIntegerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagSignedIntegerParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagSignedInteger, error) {
+func BACnetContextTagSignedIntegerParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagSignedInteger, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagSignedInteger"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
index 1eb2b6d97c..b3fceebb3f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
@@ -88,7 +88,7 @@ func (m *_BACnetContextTagUnknown) GetUnknownData() []byte {
 ///////////////////////////////////////////////////////////
 
 // NewBACnetContextTagUnknown factory function for _BACnetContextTagUnknown
-func NewBACnetContextTagUnknown(unknownData []byte, header BACnetTagHeader, tagNumberArgument uint8, actualLength uint32) *_BACnetContextTagUnknown {
+func NewBACnetContextTagUnknown(unknownData []byte, header BACnetTagHeader, actualLength uint32, tagNumberArgument uint8) *_BACnetContextTagUnknown {
 	_result := &_BACnetContextTagUnknown{
 		UnknownData:       unknownData,
 		_BACnetContextTag: NewBACnetContextTag(header, tagNumberArgument),
@@ -131,11 +131,11 @@ func (m *_BACnetContextTagUnknown) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagUnknownParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, actualLength uint32) (BACnetContextTagUnknown, error) {
-	return BACnetContextTagUnknownParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, actualLength)
+func BACnetContextTagUnknownParse(theBytes []byte, actualLength uint32, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagUnknown, error) {
+	return BACnetContextTagUnknownParseWithBuffer(utils.NewReadBufferByteBased(theBytes), actualLength, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagUnknownParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, actualLength uint32) (BACnetContextTagUnknown, error) {
+func BACnetContextTagUnknownParseWithBuffer(readBuffer utils.ReadBuffer, actualLength uint32, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagUnknown, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagUnknown"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
index a52f132e7a..eb1e9926b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
@@ -143,11 +143,11 @@ func (m *_BACnetContextTagUnsignedInteger) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetContextTagUnsignedIntegerParse(theBytes []byte, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagUnsignedInteger, error) {
-	return BACnetContextTagUnsignedIntegerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumberArgument, dataType, header)
+func BACnetContextTagUnsignedIntegerParse(theBytes []byte, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagUnsignedInteger, error) {
+	return BACnetContextTagUnsignedIntegerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), header, tagNumberArgument, dataType)
 }
 
-func BACnetContextTagUnsignedIntegerParseWithBuffer(readBuffer utils.ReadBuffer, tagNumberArgument uint8, dataType BACnetDataType, header BACnetTagHeader) (BACnetContextTagUnsignedInteger, error) {
+func BACnetContextTagUnsignedIntegerParseWithBuffer(readBuffer utils.ReadBuffer, header BACnetTagHeader, tagNumberArgument uint8, dataType BACnetDataType) (BACnetContextTagUnsignedInteger, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetContextTagUnsignedInteger"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
index 1c13cafe03..01c81eed19 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -202,45 +202,45 @@ func BACnetNotificationParametersParseWithBuffer(readBuffer utils.ReadBuffer, ta
 	var typeSwitchError error
 	switch {
 	case peekedTagNumber == uint8(0): // BACnetNotificationParametersChangeOfBitString
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfBitStringParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfBitStringParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(1): // BACnetNotificationParametersChangeOfState
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfStateParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfStateParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(2): // BACnetNotificationParametersChangeOfValue
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(3): // BACnetNotificationParametersCommandFailure
-		_childTemp, typeSwitchError = BACnetNotificationParametersCommandFailureParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersCommandFailureParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(4): // BACnetNotificationParametersFloatingLimit
-		_childTemp, typeSwitchError = BACnetNotificationParametersFloatingLimitParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersFloatingLimitParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(5): // BACnetNotificationParametersOutOfRange
-		_childTemp, typeSwitchError = BACnetNotificationParametersOutOfRangeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersOutOfRangeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(6): // BACnetNotificationParametersComplexEventType
-		_childTemp, typeSwitchError = BACnetNotificationParametersComplexEventTypeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersComplexEventTypeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(8): // BACnetNotificationParametersChangeOfLifeSafety
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(9): // BACnetNotificationParametersExtended
-		_childTemp, typeSwitchError = BACnetNotificationParametersExtendedParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersExtendedParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(10): // BACnetNotificationParametersBufferReady
-		_childTemp, typeSwitchError = BACnetNotificationParametersBufferReadyParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersBufferReadyParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(11): // BACnetNotificationParametersUnsignedRange
-		_childTemp, typeSwitchError = BACnetNotificationParametersUnsignedRangeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersUnsignedRangeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(13): // BACnetNotificationParametersAccessEvent
-		_childTemp, typeSwitchError = BACnetNotificationParametersAccessEventParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersAccessEventParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(14): // BACnetNotificationParametersDoubleOutOfRange
-		_childTemp, typeSwitchError = BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(15): // BACnetNotificationParametersSignedOutOfRange
-		_childTemp, typeSwitchError = BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(16): // BACnetNotificationParametersUnsignedOutOfRange
-		_childTemp, typeSwitchError = BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(17): // BACnetNotificationParametersChangeOfCharacterString
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(18): // BACnetNotificationParametersChangeOfStatusFlags
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(19): // BACnetNotificationParametersChangeOfReliability
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(21): // BACnetNotificationParametersChangeOfDiscreteValue
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	case peekedTagNumber == uint8(22): // BACnetNotificationParametersChangeOfTimer
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfTimerParseWithBuffer(readBuffer, tagNumber, objectTypeArgument, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfTimerParseWithBuffer(readBuffer, peekedTagNumber, tagNumber, objectTypeArgument)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [peekedTagNumber=%v]", peekedTagNumber)
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
index d5196a2794..2db27c8054 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
@@ -204,11 +204,11 @@ func (m *_BACnetNotificationParametersAccessEvent) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersAccessEventParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersAccessEvent, error) {
-	return BACnetNotificationParametersAccessEventParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersAccessEventParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersAccessEvent, error) {
+	return BACnetNotificationParametersAccessEventParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersAccessEventParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersAccessEvent, error) {
+func BACnetNotificationParametersAccessEventParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersAccessEvent, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersAccessEvent"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
index 3c10a2b94f..84e6a9d10f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersBufferReady) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersBufferReadyParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersBufferReady, error) {
-	return BACnetNotificationParametersBufferReadyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersBufferReadyParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersBufferReady, error) {
+	return BACnetNotificationParametersBufferReadyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersBufferReadyParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersBufferReady, error) {
+func BACnetNotificationParametersBufferReadyParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersBufferReady, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersBufferReady"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
index 49590c0955..5c92e8ad86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
@@ -157,11 +157,11 @@ func (m *_BACnetNotificationParametersChangeOfBitString) GetLengthInBytes() uint
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfBitStringParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfBitString, error) {
-	return BACnetNotificationParametersChangeOfBitStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfBitStringParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfBitString, error) {
+	return BACnetNotificationParametersChangeOfBitStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfBitStringParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfBitString, error) {
+func BACnetNotificationParametersChangeOfBitStringParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfBitString, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfBitString"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
index ce682fc813..ab233f0ba2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersChangeOfCharacterString) GetLengthInBytes(
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfCharacterStringParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfCharacterString, error) {
-	return BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfCharacterStringParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfCharacterString, error) {
+	return BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfCharacterString, error) {
+func BACnetNotificationParametersChangeOfCharacterStringParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfCharacterString, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfCharacterString"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
index d87ec78b2a..3c260554a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
@@ -157,11 +157,11 @@ func (m *_BACnetNotificationParametersChangeOfDiscreteValue) GetLengthInBytes()
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfDiscreteValueParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfDiscreteValue, error) {
-	return BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfDiscreteValueParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfDiscreteValue, error) {
+	return BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfDiscreteValue, error) {
+func BACnetNotificationParametersChangeOfDiscreteValueParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfDiscreteValue, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfDiscreteValue"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
index 36c2465f61..d8c1d9deab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersChangeOfLifeSafety) GetLengthInBytes() uin
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfLifeSafetyParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfLifeSafety, error) {
-	return BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfLifeSafetyParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfLifeSafety, error) {
+	return BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfLifeSafety, error) {
+func BACnetNotificationParametersChangeOfLifeSafetyParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfLifeSafety, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfLifeSafety"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
index 458130dbe5..dede0d586f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersChangeOfReliability) GetLengthInBytes() ui
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfReliabilityParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfReliability, error) {
-	return BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfReliabilityParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfReliability, error) {
+	return BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfReliability, error) {
+func BACnetNotificationParametersChangeOfReliabilityParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfReliability, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfReliability"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
index 17e5343af4..1988808919 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
@@ -157,11 +157,11 @@ func (m *_BACnetNotificationParametersChangeOfState) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfStateParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfState, error) {
-	return BACnetNotificationParametersChangeOfStateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfStateParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfState, error) {
+	return BACnetNotificationParametersChangeOfStateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfStateParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfState, error) {
+func BACnetNotificationParametersChangeOfStateParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfState, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfState"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
index 58292ba77e..ccc2da7bc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
@@ -157,11 +157,11 @@ func (m *_BACnetNotificationParametersChangeOfStatusFlags) GetLengthInBytes() ui
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfStatusFlagsParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfStatusFlags, error) {
-	return BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfStatusFlagsParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfStatusFlags, error) {
+	return BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfStatusFlags, error) {
+func BACnetNotificationParametersChangeOfStatusFlagsParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfStatusFlags, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfStatusFlags"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
index 743b7ab01f..9d724fb517 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
@@ -208,11 +208,11 @@ func (m *_BACnetNotificationParametersChangeOfTimer) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfTimerParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfTimer, error) {
-	return BACnetNotificationParametersChangeOfTimerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfTimerParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfTimer, error) {
+	return BACnetNotificationParametersChangeOfTimerParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfTimerParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfTimer, error) {
+func BACnetNotificationParametersChangeOfTimerParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfTimer, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfTimer"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
index e00e84c7a1..de61b0b556 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
@@ -157,11 +157,11 @@ func (m *_BACnetNotificationParametersChangeOfValue) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfValueParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValue, error) {
-	return BACnetNotificationParametersChangeOfValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersChangeOfValueParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfValue, error) {
+	return BACnetNotificationParametersChangeOfValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersChangeOfValueParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValue, error) {
+func BACnetNotificationParametersChangeOfValueParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersChangeOfValue, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfValue"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index 26d1698a1f..67b45680c2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -201,9 +201,9 @@ func BACnetNotificationParametersChangeOfValueNewValueParseWithBuffer(readBuffer
 	var typeSwitchError error
 	switch {
 	case peekedTagNumber == uint8(0): // BACnetNotificationParametersChangeOfValueNewValueChangedBits
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(readBuffer, tagNumber, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(readBuffer, peekedTagNumber, tagNumber)
 	case peekedTagNumber == uint8(1): // BACnetNotificationParametersChangeOfValueNewValueChangedValue
-		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(readBuffer, tagNumber, peekedTagNumber)
+		_childTemp, typeSwitchError = BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(readBuffer, peekedTagNumber, tagNumber)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [peekedTagNumber=%v]", peekedTagNumber)
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
index f97a03870e..24587b640a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
@@ -124,11 +124,11 @@ func (m *_BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetLengt
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParse(theBytes []byte, tagNumber uint8, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedBits, error) {
-	return BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, peekedTagNumber)
+func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedBits, error) {
+	return BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber)
 }
 
-func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedBits, error) {
+func BACnetNotificationParametersChangeOfValueNewValueChangedBitsParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedBits, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfValueNewValueChangedBits"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
index 32acdf81b5..436229dc68 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
@@ -124,11 +124,11 @@ func (m *_BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetLeng
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersChangeOfValueNewValueChangedValueParse(theBytes []byte, tagNumber uint8, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedValue, error) {
-	return BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, peekedTagNumber)
+func BACnetNotificationParametersChangeOfValueNewValueChangedValueParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedValue, error) {
+	return BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber)
 }
 
-func BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, peekedTagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedValue, error) {
+func BACnetNotificationParametersChangeOfValueNewValueChangedValueParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8) (BACnetNotificationParametersChangeOfValueNewValueChangedValue, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersChangeOfValueNewValueChangedValue"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
index 37119694c1..2074a4515d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersCommandFailure) GetLengthInBytes() uint16
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersCommandFailureParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersCommandFailure, error) {
-	return BACnetNotificationParametersCommandFailureParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersCommandFailureParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersCommandFailure, error) {
+	return BACnetNotificationParametersCommandFailureParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersCommandFailureParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersCommandFailure, error) {
+func BACnetNotificationParametersCommandFailureParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersCommandFailure, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersCommandFailure"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
index 7ebd4b1dc3..59a803c575 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
@@ -124,11 +124,11 @@ func (m *_BACnetNotificationParametersComplexEventType) GetLengthInBytes() uint1
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersComplexEventTypeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersComplexEventType, error) {
-	return BACnetNotificationParametersComplexEventTypeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersComplexEventTypeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersComplexEventType, error) {
+	return BACnetNotificationParametersComplexEventTypeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersComplexEventTypeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersComplexEventType, error) {
+func BACnetNotificationParametersComplexEventTypeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersComplexEventType, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersComplexEventType"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
index 18b989931a..c2859eff9b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersDoubleOutOfRange) GetLengthInBytes() uint1
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersDoubleOutOfRangeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersDoubleOutOfRange, error) {
-	return BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersDoubleOutOfRangeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersDoubleOutOfRange, error) {
+	return BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersDoubleOutOfRange, error) {
+func BACnetNotificationParametersDoubleOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersDoubleOutOfRange, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersDoubleOutOfRange"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
index 8f3cac204a..c84087330e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersExtended) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersExtendedParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersExtended, error) {
-	return BACnetNotificationParametersExtendedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersExtendedParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersExtended, error) {
+	return BACnetNotificationParametersExtendedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersExtendedParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersExtended, error) {
+func BACnetNotificationParametersExtendedParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersExtended, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersExtended"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
index 49ff9fa4d4..75b7fb97c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersFloatingLimit) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersFloatingLimitParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersFloatingLimit, error) {
-	return BACnetNotificationParametersFloatingLimitParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersFloatingLimitParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersFloatingLimit, error) {
+	return BACnetNotificationParametersFloatingLimitParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersFloatingLimitParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersFloatingLimit, error) {
+func BACnetNotificationParametersFloatingLimitParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersFloatingLimit, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersFloatingLimit"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
index 34483898b9..0caedc6055 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersOutOfRange) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersOutOfRangeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersOutOfRange, error) {
-	return BACnetNotificationParametersOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersOutOfRangeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersOutOfRange, error) {
+	return BACnetNotificationParametersOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersOutOfRange, error) {
+func BACnetNotificationParametersOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersOutOfRange, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersOutOfRange"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
index 711bc7928f..82eb0e344d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersSignedOutOfRange) GetLengthInBytes() uint1
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersSignedOutOfRangeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersSignedOutOfRange, error) {
-	return BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersSignedOutOfRangeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersSignedOutOfRange, error) {
+	return BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersSignedOutOfRange, error) {
+func BACnetNotificationParametersSignedOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersSignedOutOfRange, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersSignedOutOfRange"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
index fb2e0532c7..4b0b91c8cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
@@ -179,11 +179,11 @@ func (m *_BACnetNotificationParametersUnsignedOutOfRange) GetLengthInBytes() uin
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersUnsignedOutOfRangeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersUnsignedOutOfRange, error) {
-	return BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersUnsignedOutOfRangeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersUnsignedOutOfRange, error) {
+	return BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersUnsignedOutOfRange, error) {
+func BACnetNotificationParametersUnsignedOutOfRangeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersUnsignedOutOfRange, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersUnsignedOutOfRange"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
index 2a828a3c71..9b20836abf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
@@ -168,11 +168,11 @@ func (m *_BACnetNotificationParametersUnsignedRange) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetNotificationParametersUnsignedRangeParse(theBytes []byte, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersUnsignedRange, error) {
-	return BACnetNotificationParametersUnsignedRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), tagNumber, objectTypeArgument, peekedTagNumber)
+func BACnetNotificationParametersUnsignedRangeParse(theBytes []byte, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersUnsignedRange, error) {
+	return BACnetNotificationParametersUnsignedRangeParseWithBuffer(utils.NewReadBufferByteBased(theBytes), peekedTagNumber, tagNumber, objectTypeArgument)
 }
 
-func BACnetNotificationParametersUnsignedRangeParseWithBuffer(readBuffer utils.ReadBuffer, tagNumber uint8, objectTypeArgument BACnetObjectType, peekedTagNumber uint8) (BACnetNotificationParametersUnsignedRange, error) {
+func BACnetNotificationParametersUnsignedRangeParseWithBuffer(readBuffer utils.ReadBuffer, peekedTagNumber uint8, tagNumber uint8, objectTypeArgument BACnetObjectType) (BACnetNotificationParametersUnsignedRange, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetNotificationParametersUnsignedRange"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
index b6dee79cc8..a55704d383 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
@@ -176,7 +176,7 @@ func BACnetServiceAckParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLeng
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY: // BACnetServiceAckReadProperty
 		_childTemp, typeSwitchError = BACnetServiceAckReadPropertyParseWithBuffer(readBuffer, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE: // BACnetServiceAckReadPropertyMultiple
-		_childTemp, typeSwitchError = BACnetServiceAckReadPropertyMultipleParseWithBuffer(readBuffer, serviceAckLength, serviceAckPayloadLength)
+		_childTemp, typeSwitchError = BACnetServiceAckReadPropertyMultipleParseWithBuffer(readBuffer, serviceAckPayloadLength, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_RANGE: // BACnetServiceAckReadRange
 		_childTemp, typeSwitchError = BACnetServiceAckReadRangeParseWithBuffer(readBuffer, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER: // BACnetServiceAckConfirmedPrivateTransfer
@@ -186,11 +186,11 @@ func BACnetServiceAckParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLeng
 	case serviceChoice == BACnetConfirmedServiceChoice_VT_DATA: // BACnetServiceAckVTData
 		_childTemp, typeSwitchError = BACnetServiceAckVTDataParseWithBuffer(readBuffer, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_AUTHENTICATE: // BACnetServiceAckAuthenticate
-		_childTemp, typeSwitchError = BACnetServiceAckAuthenticateParseWithBuffer(readBuffer, serviceAckLength, serviceAckPayloadLength)
+		_childTemp, typeSwitchError = BACnetServiceAckAuthenticateParseWithBuffer(readBuffer, serviceAckPayloadLength, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_REQUEST_KEY: // BACnetServiceAckRequestKey
-		_childTemp, typeSwitchError = BACnetServiceAckRequestKeyParseWithBuffer(readBuffer, serviceAckLength, serviceAckPayloadLength)
+		_childTemp, typeSwitchError = BACnetServiceAckRequestKeyParseWithBuffer(readBuffer, serviceAckPayloadLength, serviceAckLength)
 	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL: // BACnetServiceAckReadPropertyConditional
-		_childTemp, typeSwitchError = BACnetServiceAckReadPropertyConditionalParseWithBuffer(readBuffer, serviceAckLength, serviceAckPayloadLength)
+		_childTemp, typeSwitchError = BACnetServiceAckReadPropertyConditionalParseWithBuffer(readBuffer, serviceAckPayloadLength, serviceAckLength)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [serviceChoice=%v]", serviceChoice)
 	}
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
index b76dc6b420..b3a3589423 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
@@ -86,7 +86,7 @@ func (m *_BACnetServiceAckAuthenticate) GetBytesOfRemovedService() []byte {
 ///////////////////////////////////////////////////////////
 
 // NewBACnetServiceAckAuthenticate factory function for _BACnetServiceAckAuthenticate
-func NewBACnetServiceAckAuthenticate(bytesOfRemovedService []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) *_BACnetServiceAckAuthenticate {
+func NewBACnetServiceAckAuthenticate(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckAuthenticate {
 	_result := &_BACnetServiceAckAuthenticate{
 		BytesOfRemovedService: bytesOfRemovedService,
 		_BACnetServiceAck:     NewBACnetServiceAck(serviceAckLength),
@@ -129,11 +129,11 @@ func (m *_BACnetServiceAckAuthenticate) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetServiceAckAuthenticateParse(theBytes []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckAuthenticate, error) {
-	return BACnetServiceAckAuthenticateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckLength, serviceAckPayloadLength)
+func BACnetServiceAckAuthenticateParse(theBytes []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckAuthenticate, error) {
+	return BACnetServiceAckAuthenticateParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckPayloadLength, serviceAckLength)
 }
 
-func BACnetServiceAckAuthenticateParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckAuthenticate, error) {
+func BACnetServiceAckAuthenticateParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckAuthenticate, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetServiceAckAuthenticate"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
index 4cdac6c80a..fb002c917d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
@@ -86,7 +86,7 @@ func (m *_BACnetServiceAckReadPropertyConditional) GetBytesOfRemovedService() []
 ///////////////////////////////////////////////////////////
 
 // NewBACnetServiceAckReadPropertyConditional factory function for _BACnetServiceAckReadPropertyConditional
-func NewBACnetServiceAckReadPropertyConditional(bytesOfRemovedService []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) *_BACnetServiceAckReadPropertyConditional {
+func NewBACnetServiceAckReadPropertyConditional(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckReadPropertyConditional {
 	_result := &_BACnetServiceAckReadPropertyConditional{
 		BytesOfRemovedService: bytesOfRemovedService,
 		_BACnetServiceAck:     NewBACnetServiceAck(serviceAckLength),
@@ -129,11 +129,11 @@ func (m *_BACnetServiceAckReadPropertyConditional) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetServiceAckReadPropertyConditionalParse(theBytes []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckReadPropertyConditional, error) {
-	return BACnetServiceAckReadPropertyConditionalParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckLength, serviceAckPayloadLength)
+func BACnetServiceAckReadPropertyConditionalParse(theBytes []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckReadPropertyConditional, error) {
+	return BACnetServiceAckReadPropertyConditionalParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckPayloadLength, serviceAckLength)
 }
 
-func BACnetServiceAckReadPropertyConditionalParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckReadPropertyConditional, error) {
+func BACnetServiceAckReadPropertyConditionalParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckReadPropertyConditional, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetServiceAckReadPropertyConditional"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
index 212b64345a..5b494770a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
@@ -86,7 +86,7 @@ func (m *_BACnetServiceAckReadPropertyMultiple) GetData() []BACnetReadAccessResu
 ///////////////////////////////////////////////////////////
 
 // NewBACnetServiceAckReadPropertyMultiple factory function for _BACnetServiceAckReadPropertyMultiple
-func NewBACnetServiceAckReadPropertyMultiple(data []BACnetReadAccessResult, serviceAckLength uint32, serviceAckPayloadLength uint32) *_BACnetServiceAckReadPropertyMultiple {
+func NewBACnetServiceAckReadPropertyMultiple(data []BACnetReadAccessResult, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckReadPropertyMultiple {
 	_result := &_BACnetServiceAckReadPropertyMultiple{
 		Data:              data,
 		_BACnetServiceAck: NewBACnetServiceAck(serviceAckLength),
@@ -131,11 +131,11 @@ func (m *_BACnetServiceAckReadPropertyMultiple) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetServiceAckReadPropertyMultipleParse(theBytes []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckReadPropertyMultiple, error) {
-	return BACnetServiceAckReadPropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckLength, serviceAckPayloadLength)
+func BACnetServiceAckReadPropertyMultipleParse(theBytes []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckReadPropertyMultiple, error) {
+	return BACnetServiceAckReadPropertyMultipleParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckPayloadLength, serviceAckLength)
 }
 
-func BACnetServiceAckReadPropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckReadPropertyMultiple, error) {
+func BACnetServiceAckReadPropertyMultipleParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckReadPropertyMultiple, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetServiceAckReadPropertyMultiple"); pullErr != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
index a78ef80a9c..d4d005b500 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
@@ -86,7 +86,7 @@ func (m *_BACnetServiceAckRequestKey) GetBytesOfRemovedService() []byte {
 ///////////////////////////////////////////////////////////
 
 // NewBACnetServiceAckRequestKey factory function for _BACnetServiceAckRequestKey
-func NewBACnetServiceAckRequestKey(bytesOfRemovedService []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) *_BACnetServiceAckRequestKey {
+func NewBACnetServiceAckRequestKey(bytesOfRemovedService []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) *_BACnetServiceAckRequestKey {
 	_result := &_BACnetServiceAckRequestKey{
 		BytesOfRemovedService: bytesOfRemovedService,
 		_BACnetServiceAck:     NewBACnetServiceAck(serviceAckLength),
@@ -129,11 +129,11 @@ func (m *_BACnetServiceAckRequestKey) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetServiceAckRequestKeyParse(theBytes []byte, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckRequestKey, error) {
-	return BACnetServiceAckRequestKeyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckLength, serviceAckPayloadLength)
+func BACnetServiceAckRequestKeyParse(theBytes []byte, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckRequestKey, error) {
+	return BACnetServiceAckRequestKeyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), serviceAckPayloadLength, serviceAckLength)
 }
 
-func BACnetServiceAckRequestKeyParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckLength uint32, serviceAckPayloadLength uint32) (BACnetServiceAckRequestKey, error) {
+func BACnetServiceAckRequestKeyParseWithBuffer(readBuffer utils.ReadBuffer, serviceAckPayloadLength uint32, serviceAckLength uint32) (BACnetServiceAckRequestKey, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("BACnetServiceAckRequestKey"); pullErr != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALData.go b/plc4go/protocols/cbus/readwrite/model/CALData.go
index 48461e1910..ab0d264b67 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALData.go
@@ -219,17 +219,17 @@ func CALDataParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestC
 	case commandType == CALCommandType_GET_STATUS: // CALDataGetStatus
 		_childTemp, typeSwitchError = CALDataGetStatusParseWithBuffer(readBuffer, requestContext)
 	case commandType == CALCommandType_WRITE: // CALDataWrite
-		_childTemp, typeSwitchError = CALDataWriteParseWithBuffer(readBuffer, requestContext, commandTypeContainer)
+		_childTemp, typeSwitchError = CALDataWriteParseWithBuffer(readBuffer, commandTypeContainer, requestContext)
 	case commandType == CALCommandType_REPLY && sendIdentifyRequestBefore == bool(true): // CALDataIdentifyReply
-		_childTemp, typeSwitchError = CALDataIdentifyReplyParseWithBuffer(readBuffer, requestContext, commandTypeContainer)
+		_childTemp, typeSwitchError = CALDataIdentifyReplyParseWithBuffer(readBuffer, commandTypeContainer, requestContext)
 	case commandType == CALCommandType_REPLY: // CALDataReply
-		_childTemp, typeSwitchError = CALDataReplyParseWithBuffer(readBuffer, requestContext, commandTypeContainer)
+		_childTemp, typeSwitchError = CALDataReplyParseWithBuffer(readBuffer, commandTypeContainer, requestContext)
 	case commandType == CALCommandType_ACKNOWLEDGE: // CALDataAcknowledge
 		_childTemp, typeSwitchError = CALDataAcknowledgeParseWithBuffer(readBuffer, requestContext)
 	case commandType == CALCommandType_STATUS: // CALDataStatus
-		_childTemp, typeSwitchError = CALDataStatusParseWithBuffer(readBuffer, requestContext, commandTypeContainer)
+		_childTemp, typeSwitchError = CALDataStatusParseWithBuffer(readBuffer, commandTypeContainer, requestContext)
 	case commandType == CALCommandType_STATUS_EXTENDED: // CALDataStatusExtended
-		_childTemp, typeSwitchError = CALDataStatusExtendedParseWithBuffer(readBuffer, requestContext, commandTypeContainer)
+		_childTemp, typeSwitchError = CALDataStatusExtendedParseWithBuffer(readBuffer, commandTypeContainer, requestContext)
 	default:
 		typeSwitchError = errors.Errorf("Unmapped type for parameters [commandType=%v, sendIdentifyRequestBefore=%v]", commandType, sendIdentifyRequestBefore)
 	}
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
index 205d16f498..f6d7a9353c 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
@@ -134,11 +134,11 @@ func (m *_CALDataIdentifyReply) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func CALDataIdentifyReplyParse(theBytes []byte, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataIdentifyReply, error) {
-	return CALDataIdentifyReplyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), requestContext, commandTypeContainer)
+func CALDataIdentifyReplyParse(theBytes []byte, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataIdentifyReply, error) {
+	return CALDataIdentifyReplyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), commandTypeContainer, requestContext)
 }
 
-func CALDataIdentifyReplyParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataIdentifyReply, error) {
+func CALDataIdentifyReplyParseWithBuffer(readBuffer utils.ReadBuffer, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataIdentifyReply, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("CALDataIdentifyReply"); pullErr != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
index a32939aeba..8f6ef4d930 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
@@ -134,11 +134,11 @@ func (m *_CALDataReply) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func CALDataReplyParse(theBytes []byte, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataReply, error) {
-	return CALDataReplyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), requestContext, commandTypeContainer)
+func CALDataReplyParse(theBytes []byte, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataReply, error) {
+	return CALDataReplyParseWithBuffer(utils.NewReadBufferByteBased(theBytes), commandTypeContainer, requestContext)
 }
 
-func CALDataReplyParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataReply, error) {
+func CALDataReplyParseWithBuffer(readBuffer utils.ReadBuffer, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataReply, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("CALDataReply"); pullErr != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
index eb2f9c3d97..c82c933e3a 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
@@ -150,11 +150,11 @@ func (m *_CALDataStatus) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func CALDataStatusParse(theBytes []byte, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataStatus, error) {
-	return CALDataStatusParseWithBuffer(utils.NewReadBufferByteBased(theBytes), requestContext, commandTypeContainer)
+func CALDataStatusParse(theBytes []byte, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataStatus, error) {
+	return CALDataStatusParseWithBuffer(utils.NewReadBufferByteBased(theBytes), commandTypeContainer, requestContext)
 }
 
-func CALDataStatusParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataStatus, error) {
+func CALDataStatusParseWithBuffer(readBuffer utils.ReadBuffer, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataStatus, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("CALDataStatus"); pullErr != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
index a14aeecbfa..6c7ec27541 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
@@ -204,11 +204,11 @@ func (m *_CALDataStatusExtended) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func CALDataStatusExtendedParse(theBytes []byte, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataStatusExtended, error) {
-	return CALDataStatusExtendedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), requestContext, commandTypeContainer)
+func CALDataStatusExtendedParse(theBytes []byte, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataStatusExtended, error) {
+	return CALDataStatusExtendedParseWithBuffer(utils.NewReadBufferByteBased(theBytes), commandTypeContainer, requestContext)
 }
 
-func CALDataStatusExtendedParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataStatusExtended, error) {
+func CALDataStatusExtendedParseWithBuffer(readBuffer utils.ReadBuffer, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataStatusExtended, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("CALDataStatusExtended"); pullErr != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
index bfa09e999b..8190beff5f 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
@@ -145,11 +145,11 @@ func (m *_CALDataWrite) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func CALDataWriteParse(theBytes []byte, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataWrite, error) {
-	return CALDataWriteParseWithBuffer(utils.NewReadBufferByteBased(theBytes), requestContext, commandTypeContainer)
+func CALDataWriteParse(theBytes []byte, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataWrite, error) {
+	return CALDataWriteParseWithBuffer(utils.NewReadBufferByteBased(theBytes), commandTypeContainer, requestContext)
 }
 
-func CALDataWriteParseWithBuffer(readBuffer utils.ReadBuffer, requestContext RequestContext, commandTypeContainer CALCommandTypeContainer) (CALDataWrite, error) {
+func CALDataWriteParseWithBuffer(readBuffer utils.ReadBuffer, commandTypeContainer CALCommandTypeContainer, requestContext RequestContext) (CALDataWrite, error) {
 	positionAware := readBuffer
 	_ = positionAware
 	if pullErr := readBuffer.PullContext("CALDataWrite"); pullErr != nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
index b3e35e76bd..f6280b779b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
@@ -3207,6 +3207,19 @@ func KnxDatapointParseWithBuffer(readBuffer utils.ReadBuffer, datapointType KnxD
 			return nil, errors.Wrap(_err, "Error parsing reserved field")
 		}
 
+		// Simple Field (value)
+		value, _valueErr := readBuffer.ReadFloat32("value", 32)
+		if _valueErr != nil {
+			return nil, errors.Wrap(_valueErr, "Error parsing 'value' field")
+		}
+		readBuffer.CloseContext("KnxDatapoint")
+		return values.NewPlcREAL(value), nil
+	case datapointType == KnxDatapointType_DPT_Value_ApparentPower: // REAL
+		// Reserved Field (Just skip the bytes)
+		if _, _err := readBuffer.ReadUint8("reserved", 8); _err != nil {
+			return nil, errors.Wrap(_err, "Error parsing reserved field")
+		}
+
 		// Simple Field (value)
 		value, _valueErr := readBuffer.ReadFloat32("value", 32)
 		if _valueErr != nil {
@@ -9969,6 +9982,16 @@ func KnxDatapointSerializeWithWriteBuffer(writeBuffer utils.WriteBuffer, value a
 			return errors.Wrap(_err, "Error serializing reserved field")
 		}
 
+		// Simple Field (value)
+		if _err := writeBuffer.WriteFloat32("value", 32, value.GetFloat32()); _err != nil {
+			return errors.Wrap(_err, "Error serializing 'value' field")
+		}
+	case datapointType == KnxDatapointType_DPT_Value_ApparentPower: // REAL
+		// Reserved Field (Just skip the bytes)
+		if _err := writeBuffer.WriteUint8("reserved", 8, uint8(0x00)); _err != nil {
+			return errors.Wrap(_err, "Error serializing reserved field")
+		}
+
 		// Simple Field (value)
 		if _err := writeBuffer.WriteFloat32("value", 32, value.GetFloat32()); _err != nil {
 			return errors.Wrap(_err, "Error serializing 'value' field")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
index bbd6aff051..bee0b57675 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
@@ -258,134 +258,135 @@ const (
 	KnxDatapointType_DPT_Value_Volume_Flux                        KnxDatapointType = 218
 	KnxDatapointType_DPT_Value_Weight                             KnxDatapointType = 219
 	KnxDatapointType_DPT_Value_Work                               KnxDatapointType = 220
-	KnxDatapointType_DPT_Volume_Flux_Meter                        KnxDatapointType = 221
-	KnxDatapointType_DPT_Volume_Flux_ls                           KnxDatapointType = 222
-	KnxDatapointType_DPT_Access_Data                              KnxDatapointType = 223
-	KnxDatapointType_DPT_String_ASCII                             KnxDatapointType = 224
-	KnxDatapointType_DPT_String_8859_1                            KnxDatapointType = 225
-	KnxDatapointType_DPT_SceneNumber                              KnxDatapointType = 226
-	KnxDatapointType_DPT_SceneControl                             KnxDatapointType = 227
-	KnxDatapointType_DPT_DateTime                                 KnxDatapointType = 228
-	KnxDatapointType_DPT_SCLOMode                                 KnxDatapointType = 229
-	KnxDatapointType_DPT_BuildingMode                             KnxDatapointType = 230
-	KnxDatapointType_DPT_OccMode                                  KnxDatapointType = 231
-	KnxDatapointType_DPT_Priority                                 KnxDatapointType = 232
-	KnxDatapointType_DPT_LightApplicationMode                     KnxDatapointType = 233
-	KnxDatapointType_DPT_ApplicationArea                          KnxDatapointType = 234
-	KnxDatapointType_DPT_AlarmClassType                           KnxDatapointType = 235
-	KnxDatapointType_DPT_PSUMode                                  KnxDatapointType = 236
-	KnxDatapointType_DPT_ErrorClass_System                        KnxDatapointType = 237
-	KnxDatapointType_DPT_ErrorClass_HVAC                          KnxDatapointType = 238
-	KnxDatapointType_DPT_Time_Delay                               KnxDatapointType = 239
-	KnxDatapointType_DPT_Beaufort_Wind_Force_Scale                KnxDatapointType = 240
-	KnxDatapointType_DPT_SensorSelect                             KnxDatapointType = 241
-	KnxDatapointType_DPT_ActuatorConnectType                      KnxDatapointType = 242
-	KnxDatapointType_DPT_Cloud_Cover                              KnxDatapointType = 243
-	KnxDatapointType_DPT_PowerReturnMode                          KnxDatapointType = 244
-	KnxDatapointType_DPT_FuelType                                 KnxDatapointType = 245
-	KnxDatapointType_DPT_BurnerType                               KnxDatapointType = 246
-	KnxDatapointType_DPT_HVACMode                                 KnxDatapointType = 247
-	KnxDatapointType_DPT_DHWMode                                  KnxDatapointType = 248
-	KnxDatapointType_DPT_LoadPriority                             KnxDatapointType = 249
-	KnxDatapointType_DPT_HVACContrMode                            KnxDatapointType = 250
-	KnxDatapointType_DPT_HVACEmergMode                            KnxDatapointType = 251
-	KnxDatapointType_DPT_ChangeoverMode                           KnxDatapointType = 252
-	KnxDatapointType_DPT_ValveMode                                KnxDatapointType = 253
-	KnxDatapointType_DPT_DamperMode                               KnxDatapointType = 254
-	KnxDatapointType_DPT_HeaterMode                               KnxDatapointType = 255
-	KnxDatapointType_DPT_FanMode                                  KnxDatapointType = 256
-	KnxDatapointType_DPT_MasterSlaveMode                          KnxDatapointType = 257
-	KnxDatapointType_DPT_StatusRoomSetp                           KnxDatapointType = 258
-	KnxDatapointType_DPT_Metering_DeviceType                      KnxDatapointType = 259
-	KnxDatapointType_DPT_HumDehumMode                             KnxDatapointType = 260
-	KnxDatapointType_DPT_EnableHCStage                            KnxDatapointType = 261
-	KnxDatapointType_DPT_ADAType                                  KnxDatapointType = 262
-	KnxDatapointType_DPT_BackupMode                               KnxDatapointType = 263
-	KnxDatapointType_DPT_StartSynchronization                     KnxDatapointType = 264
-	KnxDatapointType_DPT_Behaviour_Lock_Unlock                    KnxDatapointType = 265
-	KnxDatapointType_DPT_Behaviour_Bus_Power_Up_Down              KnxDatapointType = 266
-	KnxDatapointType_DPT_DALI_Fade_Time                           KnxDatapointType = 267
-	KnxDatapointType_DPT_BlinkingMode                             KnxDatapointType = 268
-	KnxDatapointType_DPT_LightControlMode                         KnxDatapointType = 269
-	KnxDatapointType_DPT_SwitchPBModel                            KnxDatapointType = 270
-	KnxDatapointType_DPT_PBAction                                 KnxDatapointType = 271
-	KnxDatapointType_DPT_DimmPBModel                              KnxDatapointType = 272
-	KnxDatapointType_DPT_SwitchOnMode                             KnxDatapointType = 273
-	KnxDatapointType_DPT_LoadTypeSet                              KnxDatapointType = 274
-	KnxDatapointType_DPT_LoadTypeDetected                         KnxDatapointType = 275
-	KnxDatapointType_DPT_Converter_Test_Control                   KnxDatapointType = 276
-	KnxDatapointType_DPT_SABExcept_Behaviour                      KnxDatapointType = 277
-	KnxDatapointType_DPT_SABBehaviour_Lock_Unlock                 KnxDatapointType = 278
-	KnxDatapointType_DPT_SSSBMode                                 KnxDatapointType = 279
-	KnxDatapointType_DPT_BlindsControlMode                        KnxDatapointType = 280
-	KnxDatapointType_DPT_CommMode                                 KnxDatapointType = 281
-	KnxDatapointType_DPT_AddInfoTypes                             KnxDatapointType = 282
-	KnxDatapointType_DPT_RF_ModeSelect                            KnxDatapointType = 283
-	KnxDatapointType_DPT_RF_FilterSelect                          KnxDatapointType = 284
-	KnxDatapointType_DPT_StatusGen                                KnxDatapointType = 285
-	KnxDatapointType_DPT_Device_Control                           KnxDatapointType = 286
-	KnxDatapointType_DPT_ForceSign                                KnxDatapointType = 287
-	KnxDatapointType_DPT_ForceSignCool                            KnxDatapointType = 288
-	KnxDatapointType_DPT_StatusRHC                                KnxDatapointType = 289
-	KnxDatapointType_DPT_StatusSDHWC                              KnxDatapointType = 290
-	KnxDatapointType_DPT_FuelTypeSet                              KnxDatapointType = 291
-	KnxDatapointType_DPT_StatusRCC                                KnxDatapointType = 292
-	KnxDatapointType_DPT_StatusAHU                                KnxDatapointType = 293
-	KnxDatapointType_DPT_CombinedStatus_RTSM                      KnxDatapointType = 294
-	KnxDatapointType_DPT_LightActuatorErrorInfo                   KnxDatapointType = 295
-	KnxDatapointType_DPT_RF_ModeInfo                              KnxDatapointType = 296
-	KnxDatapointType_DPT_RF_FilterInfo                            KnxDatapointType = 297
-	KnxDatapointType_DPT_Channel_Activation_8                     KnxDatapointType = 298
-	KnxDatapointType_DPT_StatusDHWC                               KnxDatapointType = 299
-	KnxDatapointType_DPT_StatusRHCC                               KnxDatapointType = 300
-	KnxDatapointType_DPT_CombinedStatus_HVA                       KnxDatapointType = 301
-	KnxDatapointType_DPT_CombinedStatus_RTC                       KnxDatapointType = 302
-	KnxDatapointType_DPT_Media                                    KnxDatapointType = 303
-	KnxDatapointType_DPT_Channel_Activation_16                    KnxDatapointType = 304
-	KnxDatapointType_DPT_OnOffAction                              KnxDatapointType = 305
-	KnxDatapointType_DPT_Alarm_Reaction                           KnxDatapointType = 306
-	KnxDatapointType_DPT_UpDown_Action                            KnxDatapointType = 307
-	KnxDatapointType_DPT_HVAC_PB_Action                           KnxDatapointType = 308
-	KnxDatapointType_DPT_DoubleNibble                             KnxDatapointType = 309
-	KnxDatapointType_DPT_SceneInfo                                KnxDatapointType = 310
-	KnxDatapointType_DPT_CombinedInfoOnOff                        KnxDatapointType = 311
-	KnxDatapointType_DPT_ActiveEnergy_V64                         KnxDatapointType = 312
-	KnxDatapointType_DPT_ApparantEnergy_V64                       KnxDatapointType = 313
-	KnxDatapointType_DPT_ReactiveEnergy_V64                       KnxDatapointType = 314
-	KnxDatapointType_DPT_Channel_Activation_24                    KnxDatapointType = 315
-	KnxDatapointType_DPT_HVACModeNext                             KnxDatapointType = 316
-	KnxDatapointType_DPT_DHWModeNext                              KnxDatapointType = 317
-	KnxDatapointType_DPT_OccModeNext                              KnxDatapointType = 318
-	KnxDatapointType_DPT_BuildingModeNext                         KnxDatapointType = 319
-	KnxDatapointType_DPT_StatusLightingActuator                   KnxDatapointType = 320
-	KnxDatapointType_DPT_Version                                  KnxDatapointType = 321
-	KnxDatapointType_DPT_AlarmInfo                                KnxDatapointType = 322
-	KnxDatapointType_DPT_TempRoomSetpSetF16_3                     KnxDatapointType = 323
-	KnxDatapointType_DPT_TempRoomSetpSetShiftF16_3                KnxDatapointType = 324
-	KnxDatapointType_DPT_Scaling_Speed                            KnxDatapointType = 325
-	KnxDatapointType_DPT_Scaling_Step_Time                        KnxDatapointType = 326
-	KnxDatapointType_DPT_MeteringValue                            KnxDatapointType = 327
-	KnxDatapointType_DPT_MBus_Address                             KnxDatapointType = 328
-	KnxDatapointType_DPT_Colour_RGB                               KnxDatapointType = 329
-	KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII                 KnxDatapointType = 330
-	KnxDatapointType_DPT_Tariff_ActiveEnergy                      KnxDatapointType = 331
-	KnxDatapointType_DPT_Prioritised_Mode_Control                 KnxDatapointType = 332
-	KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic             KnxDatapointType = 333
-	KnxDatapointType_DPT_DALI_Diagnostics                         KnxDatapointType = 334
-	KnxDatapointType_DPT_CombinedPosition                         KnxDatapointType = 335
-	KnxDatapointType_DPT_StatusSAB                                KnxDatapointType = 336
-	KnxDatapointType_DPT_Colour_xyY                               KnxDatapointType = 337
-	KnxDatapointType_DPT_Converter_Status                         KnxDatapointType = 338
-	KnxDatapointType_DPT_Converter_Test_Result                    KnxDatapointType = 339
-	KnxDatapointType_DPT_Battery_Info                             KnxDatapointType = 340
-	KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition KnxDatapointType = 341
-	KnxDatapointType_DPT_Brightness_Colour_Temperature_Control    KnxDatapointType = 342
-	KnxDatapointType_DPT_Colour_RGBW                              KnxDatapointType = 343
-	KnxDatapointType_DPT_Relative_Control_RGBW                    KnxDatapointType = 344
-	KnxDatapointType_DPT_Relative_Control_RGB                     KnxDatapointType = 345
-	KnxDatapointType_DPT_GeographicalLocation                     KnxDatapointType = 346
-	KnxDatapointType_DPT_TempRoomSetpSetF16_4                     KnxDatapointType = 347
-	KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4                KnxDatapointType = 348
+	KnxDatapointType_DPT_Value_ApparentPower                      KnxDatapointType = 221
+	KnxDatapointType_DPT_Volume_Flux_Meter                        KnxDatapointType = 222
+	KnxDatapointType_DPT_Volume_Flux_ls                           KnxDatapointType = 223
+	KnxDatapointType_DPT_Access_Data                              KnxDatapointType = 224
+	KnxDatapointType_DPT_String_ASCII                             KnxDatapointType = 225
+	KnxDatapointType_DPT_String_8859_1                            KnxDatapointType = 226
+	KnxDatapointType_DPT_SceneNumber                              KnxDatapointType = 227
+	KnxDatapointType_DPT_SceneControl                             KnxDatapointType = 228
+	KnxDatapointType_DPT_DateTime                                 KnxDatapointType = 229
+	KnxDatapointType_DPT_SCLOMode                                 KnxDatapointType = 230
+	KnxDatapointType_DPT_BuildingMode                             KnxDatapointType = 231
+	KnxDatapointType_DPT_OccMode                                  KnxDatapointType = 232
+	KnxDatapointType_DPT_Priority                                 KnxDatapointType = 233
+	KnxDatapointType_DPT_LightApplicationMode                     KnxDatapointType = 234
+	KnxDatapointType_DPT_ApplicationArea                          KnxDatapointType = 235
+	KnxDatapointType_DPT_AlarmClassType                           KnxDatapointType = 236
+	KnxDatapointType_DPT_PSUMode                                  KnxDatapointType = 237
+	KnxDatapointType_DPT_ErrorClass_System                        KnxDatapointType = 238
+	KnxDatapointType_DPT_ErrorClass_HVAC                          KnxDatapointType = 239
+	KnxDatapointType_DPT_Time_Delay                               KnxDatapointType = 240
+	KnxDatapointType_DPT_Beaufort_Wind_Force_Scale                KnxDatapointType = 241
+	KnxDatapointType_DPT_SensorSelect                             KnxDatapointType = 242
+	KnxDatapointType_DPT_ActuatorConnectType                      KnxDatapointType = 243
+	KnxDatapointType_DPT_Cloud_Cover                              KnxDatapointType = 244
+	KnxDatapointType_DPT_PowerReturnMode                          KnxDatapointType = 245
+	KnxDatapointType_DPT_FuelType                                 KnxDatapointType = 246
+	KnxDatapointType_DPT_BurnerType                               KnxDatapointType = 247
+	KnxDatapointType_DPT_HVACMode                                 KnxDatapointType = 248
+	KnxDatapointType_DPT_DHWMode                                  KnxDatapointType = 249
+	KnxDatapointType_DPT_LoadPriority                             KnxDatapointType = 250
+	KnxDatapointType_DPT_HVACContrMode                            KnxDatapointType = 251
+	KnxDatapointType_DPT_HVACEmergMode                            KnxDatapointType = 252
+	KnxDatapointType_DPT_ChangeoverMode                           KnxDatapointType = 253
+	KnxDatapointType_DPT_ValveMode                                KnxDatapointType = 254
+	KnxDatapointType_DPT_DamperMode                               KnxDatapointType = 255
+	KnxDatapointType_DPT_HeaterMode                               KnxDatapointType = 256
+	KnxDatapointType_DPT_FanMode                                  KnxDatapointType = 257
+	KnxDatapointType_DPT_MasterSlaveMode                          KnxDatapointType = 258
+	KnxDatapointType_DPT_StatusRoomSetp                           KnxDatapointType = 259
+	KnxDatapointType_DPT_Metering_DeviceType                      KnxDatapointType = 260
+	KnxDatapointType_DPT_HumDehumMode                             KnxDatapointType = 261
+	KnxDatapointType_DPT_EnableHCStage                            KnxDatapointType = 262
+	KnxDatapointType_DPT_ADAType                                  KnxDatapointType = 263
+	KnxDatapointType_DPT_BackupMode                               KnxDatapointType = 264
+	KnxDatapointType_DPT_StartSynchronization                     KnxDatapointType = 265
+	KnxDatapointType_DPT_Behaviour_Lock_Unlock                    KnxDatapointType = 266
+	KnxDatapointType_DPT_Behaviour_Bus_Power_Up_Down              KnxDatapointType = 267
+	KnxDatapointType_DPT_DALI_Fade_Time                           KnxDatapointType = 268
+	KnxDatapointType_DPT_BlinkingMode                             KnxDatapointType = 269
+	KnxDatapointType_DPT_LightControlMode                         KnxDatapointType = 270
+	KnxDatapointType_DPT_SwitchPBModel                            KnxDatapointType = 271
+	KnxDatapointType_DPT_PBAction                                 KnxDatapointType = 272
+	KnxDatapointType_DPT_DimmPBModel                              KnxDatapointType = 273
+	KnxDatapointType_DPT_SwitchOnMode                             KnxDatapointType = 274
+	KnxDatapointType_DPT_LoadTypeSet                              KnxDatapointType = 275
+	KnxDatapointType_DPT_LoadTypeDetected                         KnxDatapointType = 276
+	KnxDatapointType_DPT_Converter_Test_Control                   KnxDatapointType = 277
+	KnxDatapointType_DPT_SABExcept_Behaviour                      KnxDatapointType = 278
+	KnxDatapointType_DPT_SABBehaviour_Lock_Unlock                 KnxDatapointType = 279
+	KnxDatapointType_DPT_SSSBMode                                 KnxDatapointType = 280
+	KnxDatapointType_DPT_BlindsControlMode                        KnxDatapointType = 281
+	KnxDatapointType_DPT_CommMode                                 KnxDatapointType = 282
+	KnxDatapointType_DPT_AddInfoTypes                             KnxDatapointType = 283
+	KnxDatapointType_DPT_RF_ModeSelect                            KnxDatapointType = 284
+	KnxDatapointType_DPT_RF_FilterSelect                          KnxDatapointType = 285
+	KnxDatapointType_DPT_StatusGen                                KnxDatapointType = 286
+	KnxDatapointType_DPT_Device_Control                           KnxDatapointType = 287
+	KnxDatapointType_DPT_ForceSign                                KnxDatapointType = 288
+	KnxDatapointType_DPT_ForceSignCool                            KnxDatapointType = 289
+	KnxDatapointType_DPT_StatusRHC                                KnxDatapointType = 290
+	KnxDatapointType_DPT_StatusSDHWC                              KnxDatapointType = 291
+	KnxDatapointType_DPT_FuelTypeSet                              KnxDatapointType = 292
+	KnxDatapointType_DPT_StatusRCC                                KnxDatapointType = 293
+	KnxDatapointType_DPT_StatusAHU                                KnxDatapointType = 294
+	KnxDatapointType_DPT_CombinedStatus_RTSM                      KnxDatapointType = 295
+	KnxDatapointType_DPT_LightActuatorErrorInfo                   KnxDatapointType = 296
+	KnxDatapointType_DPT_RF_ModeInfo                              KnxDatapointType = 297
+	KnxDatapointType_DPT_RF_FilterInfo                            KnxDatapointType = 298
+	KnxDatapointType_DPT_Channel_Activation_8                     KnxDatapointType = 299
+	KnxDatapointType_DPT_StatusDHWC                               KnxDatapointType = 300
+	KnxDatapointType_DPT_StatusRHCC                               KnxDatapointType = 301
+	KnxDatapointType_DPT_CombinedStatus_HVA                       KnxDatapointType = 302
+	KnxDatapointType_DPT_CombinedStatus_RTC                       KnxDatapointType = 303
+	KnxDatapointType_DPT_Media                                    KnxDatapointType = 304
+	KnxDatapointType_DPT_Channel_Activation_16                    KnxDatapointType = 305
+	KnxDatapointType_DPT_OnOffAction                              KnxDatapointType = 306
+	KnxDatapointType_DPT_Alarm_Reaction                           KnxDatapointType = 307
+	KnxDatapointType_DPT_UpDown_Action                            KnxDatapointType = 308
+	KnxDatapointType_DPT_HVAC_PB_Action                           KnxDatapointType = 309
+	KnxDatapointType_DPT_DoubleNibble                             KnxDatapointType = 310
+	KnxDatapointType_DPT_SceneInfo                                KnxDatapointType = 311
+	KnxDatapointType_DPT_CombinedInfoOnOff                        KnxDatapointType = 312
+	KnxDatapointType_DPT_ActiveEnergy_V64                         KnxDatapointType = 313
+	KnxDatapointType_DPT_ApparantEnergy_V64                       KnxDatapointType = 314
+	KnxDatapointType_DPT_ReactiveEnergy_V64                       KnxDatapointType = 315
+	KnxDatapointType_DPT_Channel_Activation_24                    KnxDatapointType = 316
+	KnxDatapointType_DPT_HVACModeNext                             KnxDatapointType = 317
+	KnxDatapointType_DPT_DHWModeNext                              KnxDatapointType = 318
+	KnxDatapointType_DPT_OccModeNext                              KnxDatapointType = 319
+	KnxDatapointType_DPT_BuildingModeNext                         KnxDatapointType = 320
+	KnxDatapointType_DPT_StatusLightingActuator                   KnxDatapointType = 321
+	KnxDatapointType_DPT_Version                                  KnxDatapointType = 322
+	KnxDatapointType_DPT_AlarmInfo                                KnxDatapointType = 323
+	KnxDatapointType_DPT_TempRoomSetpSetF16_3                     KnxDatapointType = 324
+	KnxDatapointType_DPT_TempRoomSetpSetShiftF16_3                KnxDatapointType = 325
+	KnxDatapointType_DPT_Scaling_Speed                            KnxDatapointType = 326
+	KnxDatapointType_DPT_Scaling_Step_Time                        KnxDatapointType = 327
+	KnxDatapointType_DPT_MeteringValue                            KnxDatapointType = 328
+	KnxDatapointType_DPT_MBus_Address                             KnxDatapointType = 329
+	KnxDatapointType_DPT_Colour_RGB                               KnxDatapointType = 330
+	KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII                 KnxDatapointType = 331
+	KnxDatapointType_DPT_Tariff_ActiveEnergy                      KnxDatapointType = 332
+	KnxDatapointType_DPT_Prioritised_Mode_Control                 KnxDatapointType = 333
+	KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic             KnxDatapointType = 334
+	KnxDatapointType_DPT_DALI_Diagnostics                         KnxDatapointType = 335
+	KnxDatapointType_DPT_CombinedPosition                         KnxDatapointType = 336
+	KnxDatapointType_DPT_StatusSAB                                KnxDatapointType = 337
+	KnxDatapointType_DPT_Colour_xyY                               KnxDatapointType = 338
+	KnxDatapointType_DPT_Converter_Status                         KnxDatapointType = 339
+	KnxDatapointType_DPT_Converter_Test_Result                    KnxDatapointType = 340
+	KnxDatapointType_DPT_Battery_Info                             KnxDatapointType = 341
+	KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition KnxDatapointType = 342
+	KnxDatapointType_DPT_Brightness_Colour_Temperature_Control    KnxDatapointType = 343
+	KnxDatapointType_DPT_Colour_RGBW                              KnxDatapointType = 344
+	KnxDatapointType_DPT_Relative_Control_RGBW                    KnxDatapointType = 345
+	KnxDatapointType_DPT_Relative_Control_RGB                     KnxDatapointType = 346
+	KnxDatapointType_DPT_GeographicalLocation                     KnxDatapointType = 347
+	KnxDatapointType_DPT_TempRoomSetpSetF16_4                     KnxDatapointType = 348
+	KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4                KnxDatapointType = 349
 )
 
 var KnxDatapointTypeValues []KnxDatapointType
@@ -614,6 +615,7 @@ func init() {
 		KnxDatapointType_DPT_Value_Volume_Flux,
 		KnxDatapointType_DPT_Value_Weight,
 		KnxDatapointType_DPT_Value_Work,
+		KnxDatapointType_DPT_Value_ApparentPower,
 		KnxDatapointType_DPT_Volume_Flux_Meter,
 		KnxDatapointType_DPT_Volume_Flux_ls,
 		KnxDatapointType_DPT_Access_Data,
@@ -1297,15 +1299,15 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 221:
 		{ /* '221' */
-			return 1200
+			return 80
 		}
 	case 222:
 		{ /* '222' */
-			return 1201
+			return 1200
 		}
 	case 223:
 		{ /* '223' */
-			return 0
+			return 1201
 		}
 	case 224:
 		{ /* '224' */
@@ -1313,7 +1315,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 225:
 		{ /* '225' */
-			return 1
+			return 0
 		}
 	case 226:
 		{ /* '226' */
@@ -1337,43 +1339,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 230:
 		{ /* '230' */
-			return 2
+			return 1
 		}
 	case 231:
 		{ /* '231' */
-			return 3
+			return 2
 		}
 	case 232:
 		{ /* '232' */
-			return 4
+			return 3
 		}
 	case 233:
 		{ /* '233' */
-			return 5
+			return 4
 		}
 	case 234:
 		{ /* '234' */
-			return 6
+			return 5
 		}
 	case 235:
 		{ /* '235' */
-			return 7
+			return 6
 		}
 	case 236:
 		{ /* '236' */
-			return 8
+			return 7
 		}
 	case 237:
 		{ /* '237' */
-			return 11
+			return 8
 		}
 	case 238:
 		{ /* '238' */
-			return 12
+			return 11
 		}
 	case 239:
 		{ /* '239' */
-			return 13
+			return 12
 		}
 	case 24:
 		{ /* '24' */
@@ -1381,43 +1383,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 240:
 		{ /* '240' */
-			return 14
+			return 13
 		}
 	case 241:
 		{ /* '241' */
-			return 17
+			return 14
 		}
 	case 242:
 		{ /* '242' */
-			return 20
+			return 17
 		}
 	case 243:
 		{ /* '243' */
-			return 21
+			return 20
 		}
 	case 244:
 		{ /* '244' */
-			return 22
+			return 21
 		}
 	case 245:
 		{ /* '245' */
-			return 100
+			return 22
 		}
 	case 246:
 		{ /* '246' */
-			return 101
+			return 100
 		}
 	case 247:
 		{ /* '247' */
-			return 102
+			return 101
 		}
 	case 248:
 		{ /* '248' */
-			return 103
+			return 102
 		}
 	case 249:
 		{ /* '249' */
-			return 104
+			return 103
 		}
 	case 25:
 		{ /* '25' */
@@ -1425,43 +1427,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 250:
 		{ /* '250' */
-			return 105
+			return 104
 		}
 	case 251:
 		{ /* '251' */
-			return 106
+			return 105
 		}
 	case 252:
 		{ /* '252' */
-			return 107
+			return 106
 		}
 	case 253:
 		{ /* '253' */
-			return 108
+			return 107
 		}
 	case 254:
 		{ /* '254' */
-			return 109
+			return 108
 		}
 	case 255:
 		{ /* '255' */
-			return 110
+			return 109
 		}
 	case 256:
 		{ /* '256' */
-			return 111
+			return 110
 		}
 	case 257:
 		{ /* '257' */
-			return 112
+			return 111
 		}
 	case 258:
 		{ /* '258' */
-			return 113
+			return 112
 		}
 	case 259:
 		{ /* '259' */
-			return 114
+			return 113
 		}
 	case 26:
 		{ /* '26' */
@@ -1469,43 +1471,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 260:
 		{ /* '260' */
-			return 115
+			return 114
 		}
 	case 261:
 		{ /* '261' */
-			return 116
+			return 115
 		}
 	case 262:
 		{ /* '262' */
-			return 120
+			return 116
 		}
 	case 263:
 		{ /* '263' */
-			return 121
+			return 120
 		}
 	case 264:
 		{ /* '264' */
-			return 122
+			return 121
 		}
 	case 265:
 		{ /* '265' */
-			return 600
+			return 122
 		}
 	case 266:
 		{ /* '266' */
-			return 601
+			return 600
 		}
 	case 267:
 		{ /* '267' */
-			return 602
+			return 601
 		}
 	case 268:
 		{ /* '268' */
-			return 603
+			return 602
 		}
 	case 269:
 		{ /* '269' */
-			return 604
+			return 603
 		}
 	case 27:
 		{ /* '27' */
@@ -1513,43 +1515,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 270:
 		{ /* '270' */
-			return 605
+			return 604
 		}
 	case 271:
 		{ /* '271' */
-			return 606
+			return 605
 		}
 	case 272:
 		{ /* '272' */
-			return 607
+			return 606
 		}
 	case 273:
 		{ /* '273' */
-			return 608
+			return 607
 		}
 	case 274:
 		{ /* '274' */
-			return 609
+			return 608
 		}
 	case 275:
 		{ /* '275' */
-			return 610
+			return 609
 		}
 	case 276:
 		{ /* '276' */
-			return 611
+			return 610
 		}
 	case 277:
 		{ /* '277' */
-			return 801
+			return 611
 		}
 	case 278:
 		{ /* '278' */
-			return 802
+			return 801
 		}
 	case 279:
 		{ /* '279' */
-			return 803
+			return 802
 		}
 	case 28:
 		{ /* '28' */
@@ -1557,43 +1559,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 280:
 		{ /* '280' */
-			return 804
+			return 803
 		}
 	case 281:
 		{ /* '281' */
-			return 1000
+			return 804
 		}
 	case 282:
 		{ /* '282' */
-			return 1001
+			return 1000
 		}
 	case 283:
 		{ /* '283' */
-			return 1002
+			return 1001
 		}
 	case 284:
 		{ /* '284' */
-			return 1003
+			return 1002
 		}
 	case 285:
 		{ /* '285' */
-			return 1
+			return 1003
 		}
 	case 286:
 		{ /* '286' */
-			return 2
+			return 1
 		}
 	case 287:
 		{ /* '287' */
-			return 100
+			return 2
 		}
 	case 288:
 		{ /* '288' */
-			return 101
+			return 100
 		}
 	case 289:
 		{ /* '289' */
-			return 102
+			return 101
 		}
 	case 29:
 		{ /* '29' */
@@ -1601,43 +1603,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 290:
 		{ /* '290' */
-			return 103
+			return 102
 		}
 	case 291:
 		{ /* '291' */
-			return 104
+			return 103
 		}
 	case 292:
 		{ /* '292' */
-			return 105
+			return 104
 		}
 	case 293:
 		{ /* '293' */
-			return 106
+			return 105
 		}
 	case 294:
 		{ /* '294' */
-			return 107
+			return 106
 		}
 	case 295:
 		{ /* '295' */
-			return 601
+			return 107
 		}
 	case 296:
 		{ /* '296' */
-			return 1000
+			return 601
 		}
 	case 297:
 		{ /* '297' */
-			return 1001
+			return 1000
 		}
 	case 298:
 		{ /* '298' */
-			return 1010
+			return 1001
 		}
 	case 299:
 		{ /* '299' */
-			return 100
+			return 1010
 		}
 	case 3:
 		{ /* '3' */
@@ -1649,43 +1651,43 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 300:
 		{ /* '300' */
-			return 101
+			return 100
 		}
 	case 301:
 		{ /* '301' */
-			return 102
+			return 101
 		}
 	case 302:
 		{ /* '302' */
-			return 103
+			return 102
 		}
 	case 303:
 		{ /* '303' */
-			return 1000
+			return 103
 		}
 	case 304:
 		{ /* '304' */
-			return 1010
+			return 1000
 		}
 	case 305:
 		{ /* '305' */
-			return 1
+			return 1010
 		}
 	case 306:
 		{ /* '306' */
-			return 2
+			return 1
 		}
 	case 307:
 		{ /* '307' */
-			return 3
+			return 2
 		}
 	case 308:
 		{ /* '308' */
-			return 102
+			return 3
 		}
 	case 309:
 		{ /* '309' */
-			return 1000
+			return 102
 		}
 	case 31:
 		{ /* '31' */
@@ -1693,7 +1695,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 310:
 		{ /* '310' */
-			return 1
+			return 1000
 		}
 	case 311:
 		{ /* '311' */
@@ -1701,35 +1703,35 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 312:
 		{ /* '312' */
-			return 10
+			return 1
 		}
 	case 313:
 		{ /* '313' */
-			return 11
+			return 10
 		}
 	case 314:
 		{ /* '314' */
-			return 12
+			return 11
 		}
 	case 315:
 		{ /* '315' */
-			return 1010
+			return 12
 		}
 	case 316:
 		{ /* '316' */
-			return 100
+			return 1010
 		}
 	case 317:
 		{ /* '317' */
-			return 102
+			return 100
 		}
 	case 318:
 		{ /* '318' */
-			return 104
+			return 102
 		}
 	case 319:
 		{ /* '319' */
-			return 105
+			return 104
 		}
 	case 32:
 		{ /* '32' */
@@ -1737,11 +1739,11 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 320:
 		{ /* '320' */
-			return 600
+			return 105
 		}
 	case 321:
 		{ /* '321' */
-			return 1
+			return 600
 		}
 	case 322:
 		{ /* '322' */
@@ -1749,31 +1751,31 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 323:
 		{ /* '323' */
-			return 100
+			return 1
 		}
 	case 324:
 		{ /* '324' */
-			return 101
+			return 100
 		}
 	case 325:
 		{ /* '325' */
-			return 1
+			return 101
 		}
 	case 326:
 		{ /* '326' */
-			return 2
+			return 1
 		}
 	case 327:
 		{ /* '327' */
-			return 1
+			return 2
 		}
 	case 328:
 		{ /* '328' */
-			return 1000
+			return 1
 		}
 	case 329:
 		{ /* '329' */
-			return 600
+			return 1000
 		}
 	case 33:
 		{ /* '33' */
@@ -1781,7 +1783,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 330:
 		{ /* '330' */
-			return 1
+			return 600
 		}
 	case 331:
 		{ /* '331' */
@@ -1793,7 +1795,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 333:
 		{ /* '333' */
-			return 600
+			return 1
 		}
 	case 334:
 		{ /* '334' */
@@ -1801,7 +1803,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 335:
 		{ /* '335' */
-			return 800
+			return 600
 		}
 	case 336:
 		{ /* '336' */
@@ -1809,7 +1811,7 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 337:
 		{ /* '337' */
-			return 600
+			return 800
 		}
 	case 338:
 		{ /* '338' */
@@ -1849,14 +1851,18 @@ func (e KnxDatapointType) Number() uint16 {
 		}
 	case 346:
 		{ /* '346' */
-			return 1
+			return 600
 		}
 	case 347:
 		{ /* '347' */
-			return 100
+			return 1
 		}
 	case 348:
 		{ /* '348' */
+			return 100
+		}
+	case 349:
+		{ /* '349' */
 			return 101
 		}
 	case 35:
@@ -2711,39 +2717,39 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 221:
 		{ /* '221' */
-			return "volume flux for meters (m³/h)"
+			return "apparent power (VA)"
 		}
 	case 222:
 		{ /* '222' */
-			return "volume flux for meters (1/ls)"
+			return "volume flux for meters (m³/h)"
 		}
 	case 223:
 		{ /* '223' */
-			return "entrance access"
+			return "volume flux for meters (1/ls)"
 		}
 	case 224:
 		{ /* '224' */
-			return "Character String (ASCII)"
+			return "entrance access"
 		}
 	case 225:
 		{ /* '225' */
-			return "Character String (ISO 8859-1)"
+			return "Character String (ASCII)"
 		}
 	case 226:
 		{ /* '226' */
-			return "scene number"
+			return "Character String (ISO 8859-1)"
 		}
 	case 227:
 		{ /* '227' */
-			return "scene control"
+			return "scene number"
 		}
 	case 228:
 		{ /* '228' */
-			return "date time"
+			return "scene control"
 		}
 	case 229:
 		{ /* '229' */
-			return "SCLO mode"
+			return "date time"
 		}
 	case 23:
 		{ /* '23' */
@@ -2751,43 +2757,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 230:
 		{ /* '230' */
-			return "building mode"
+			return "SCLO mode"
 		}
 	case 231:
 		{ /* '231' */
-			return "occupied"
+			return "building mode"
 		}
 	case 232:
 		{ /* '232' */
-			return "priority"
+			return "occupied"
 		}
 	case 233:
 		{ /* '233' */
-			return "light application mode"
+			return "priority"
 		}
 	case 234:
 		{ /* '234' */
-			return "light application area"
+			return "light application mode"
 		}
 	case 235:
 		{ /* '235' */
-			return "alarm class"
+			return "light application area"
 		}
 	case 236:
 		{ /* '236' */
-			return "PSU mode"
+			return "alarm class"
 		}
 	case 237:
 		{ /* '237' */
-			return "system error class"
+			return "PSU mode"
 		}
 	case 238:
 		{ /* '238' */
-			return "HVAC error class"
+			return "system error class"
 		}
 	case 239:
 		{ /* '239' */
-			return "time delay"
+			return "HVAC error class"
 		}
 	case 24:
 		{ /* '24' */
@@ -2795,43 +2801,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 240:
 		{ /* '240' */
-			return "wind force scale (0..12)"
+			return "time delay"
 		}
 	case 241:
 		{ /* '241' */
-			return "sensor mode"
+			return "wind force scale (0..12)"
 		}
 	case 242:
 		{ /* '242' */
-			return "actuator connect type"
+			return "sensor mode"
 		}
 	case 243:
 		{ /* '243' */
-			return "cloud cover"
+			return "actuator connect type"
 		}
 	case 244:
 		{ /* '244' */
-			return "power return mode"
+			return "cloud cover"
 		}
 	case 245:
 		{ /* '245' */
-			return "fuel type"
+			return "power return mode"
 		}
 	case 246:
 		{ /* '246' */
-			return "burner type"
+			return "fuel type"
 		}
 	case 247:
 		{ /* '247' */
-			return "HVAC mode"
+			return "burner type"
 		}
 	case 248:
 		{ /* '248' */
-			return "DHW mode"
+			return "HVAC mode"
 		}
 	case 249:
 		{ /* '249' */
-			return "load priority"
+			return "DHW mode"
 		}
 	case 25:
 		{ /* '25' */
@@ -2839,43 +2845,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 250:
 		{ /* '250' */
-			return "HVAC control mode"
+			return "load priority"
 		}
 	case 251:
 		{ /* '251' */
-			return "HVAC emergency mode"
+			return "HVAC control mode"
 		}
 	case 252:
 		{ /* '252' */
-			return "changeover mode"
+			return "HVAC emergency mode"
 		}
 	case 253:
 		{ /* '253' */
-			return "valve mode"
+			return "changeover mode"
 		}
 	case 254:
 		{ /* '254' */
-			return "damper mode"
+			return "valve mode"
 		}
 	case 255:
 		{ /* '255' */
-			return "heater mode"
+			return "damper mode"
 		}
 	case 256:
 		{ /* '256' */
-			return "fan mode"
+			return "heater mode"
 		}
 	case 257:
 		{ /* '257' */
-			return "master/slave mode"
+			return "fan mode"
 		}
 	case 258:
 		{ /* '258' */
-			return "status room setpoint"
+			return "master/slave mode"
 		}
 	case 259:
 		{ /* '259' */
-			return "metering device type"
+			return "status room setpoint"
 		}
 	case 26:
 		{ /* '26' */
@@ -2883,43 +2889,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 260:
 		{ /* '260' */
-			return "hum dehum mode"
+			return "metering device type"
 		}
 	case 261:
 		{ /* '261' */
-			return "enable H/C stage"
+			return "hum dehum mode"
 		}
 	case 262:
 		{ /* '262' */
-			return "ADA type"
+			return "enable H/C stage"
 		}
 	case 263:
 		{ /* '263' */
-			return "backup mode"
+			return "ADA type"
 		}
 	case 264:
 		{ /* '264' */
-			return "start syncronization type"
+			return "backup mode"
 		}
 	case 265:
 		{ /* '265' */
-			return "behavior lock/unlock"
+			return "start syncronization type"
 		}
 	case 266:
 		{ /* '266' */
-			return "behavior bus power up/down"
+			return "behavior lock/unlock"
 		}
 	case 267:
 		{ /* '267' */
-			return "dali fade time"
+			return "behavior bus power up/down"
 		}
 	case 268:
 		{ /* '268' */
-			return "blink mode"
+			return "dali fade time"
 		}
 	case 269:
 		{ /* '269' */
-			return "light control mode"
+			return "blink mode"
 		}
 	case 27:
 		{ /* '27' */
@@ -2927,43 +2933,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 270:
 		{ /* '270' */
-			return "PB switch mode"
+			return "light control mode"
 		}
 	case 271:
 		{ /* '271' */
-			return "PB action mode"
+			return "PB switch mode"
 		}
 	case 272:
 		{ /* '272' */
-			return "PB dimm mode"
+			return "PB action mode"
 		}
 	case 273:
 		{ /* '273' */
-			return "switch on mode"
+			return "PB dimm mode"
 		}
 	case 274:
 		{ /* '274' */
-			return "load type"
+			return "switch on mode"
 		}
 	case 275:
 		{ /* '275' */
-			return "load type detection"
+			return "load type"
 		}
 	case 276:
 		{ /* '276' */
-			return "converter test control"
+			return "load type detection"
 		}
 	case 277:
 		{ /* '277' */
-			return "SAB except behavior"
+			return "converter test control"
 		}
 	case 278:
 		{ /* '278' */
-			return "SAB behavior on lock/unlock"
+			return "SAB except behavior"
 		}
 	case 279:
 		{ /* '279' */
-			return "SSSB mode"
+			return "SAB behavior on lock/unlock"
 		}
 	case 28:
 		{ /* '28' */
@@ -2971,43 +2977,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 280:
 		{ /* '280' */
-			return "blinds control mode"
+			return "SSSB mode"
 		}
 	case 281:
 		{ /* '281' */
-			return "communication mode"
+			return "blinds control mode"
 		}
 	case 282:
 		{ /* '282' */
-			return "additional information type"
+			return "communication mode"
 		}
 	case 283:
 		{ /* '283' */
-			return "RF mode selection"
+			return "additional information type"
 		}
 	case 284:
 		{ /* '284' */
-			return "RF filter mode selection"
+			return "RF mode selection"
 		}
 	case 285:
 		{ /* '285' */
-			return "general status"
+			return "RF filter mode selection"
 		}
 	case 286:
 		{ /* '286' */
-			return "device control"
+			return "general status"
 		}
 	case 287:
 		{ /* '287' */
-			return "forcing signal"
+			return "device control"
 		}
 	case 288:
 		{ /* '288' */
-			return "forcing signal cool"
+			return "forcing signal"
 		}
 	case 289:
 		{ /* '289' */
-			return "room heating controller status"
+			return "forcing signal cool"
 		}
 	case 29:
 		{ /* '29' */
@@ -3015,43 +3021,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 290:
 		{ /* '290' */
-			return "solar DHW controller status"
+			return "room heating controller status"
 		}
 	case 291:
 		{ /* '291' */
-			return "fuel type set"
+			return "solar DHW controller status"
 		}
 	case 292:
 		{ /* '292' */
-			return "room cooling controller status"
+			return "fuel type set"
 		}
 	case 293:
 		{ /* '293' */
-			return "ventilation controller status"
+			return "room cooling controller status"
 		}
 	case 294:
 		{ /* '294' */
-			return "combined status RTSM"
+			return "ventilation controller status"
 		}
 	case 295:
 		{ /* '295' */
-			return "lighting actuator error information"
+			return "combined status RTSM"
 		}
 	case 296:
 		{ /* '296' */
-			return "RF communication mode info"
+			return "lighting actuator error information"
 		}
 	case 297:
 		{ /* '297' */
-			return "cEMI server supported RF filtering modes"
+			return "RF communication mode info"
 		}
 	case 298:
 		{ /* '298' */
-			return "channel activation for 8 channels"
+			return "cEMI server supported RF filtering modes"
 		}
 	case 299:
 		{ /* '299' */
-			return "DHW controller status"
+			return "channel activation for 8 channels"
 		}
 	case 3:
 		{ /* '3' */
@@ -3063,43 +3069,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 300:
 		{ /* '300' */
-			return "RHCC status"
+			return "DHW controller status"
 		}
 	case 301:
 		{ /* '301' */
-			return "combined status HVA"
+			return "RHCC status"
 		}
 	case 302:
 		{ /* '302' */
-			return "combined status RTC"
+			return "combined status HVA"
 		}
 	case 303:
 		{ /* '303' */
-			return "media"
+			return "combined status RTC"
 		}
 	case 304:
 		{ /* '304' */
-			return "channel activation for 16 channels"
+			return "media"
 		}
 	case 305:
 		{ /* '305' */
-			return "on/off action"
+			return "channel activation for 16 channels"
 		}
 	case 306:
 		{ /* '306' */
-			return "alarm reaction"
+			return "on/off action"
 		}
 	case 307:
 		{ /* '307' */
-			return "up/down action"
+			return "alarm reaction"
 		}
 	case 308:
 		{ /* '308' */
-			return "HVAC push button action"
+			return "up/down action"
 		}
 	case 309:
 		{ /* '309' */
-			return "busy/nak repetitions"
+			return "HVAC push button action"
 		}
 	case 31:
 		{ /* '31' */
@@ -3107,43 +3113,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 310:
 		{ /* '310' */
-			return "scene information"
+			return "busy/nak repetitions"
 		}
 	case 311:
 		{ /* '311' */
-			return "bit-combined info on/off"
+			return "scene information"
 		}
 	case 312:
 		{ /* '312' */
-			return "active energy (Wh)"
+			return "bit-combined info on/off"
 		}
 	case 313:
 		{ /* '313' */
-			return "apparant energy (VAh)"
+			return "active energy (Wh)"
 		}
 	case 314:
 		{ /* '314' */
-			return "reactive energy (VARh)"
+			return "apparant energy (VAh)"
 		}
 	case 315:
 		{ /* '315' */
-			return "activation state 0..23"
+			return "reactive energy (VARh)"
 		}
 	case 316:
 		{ /* '316' */
-			return "time delay & HVAC mode"
+			return "activation state 0..23"
 		}
 	case 317:
 		{ /* '317' */
-			return "time delay & DHW mode"
+			return "time delay & HVAC mode"
 		}
 	case 318:
 		{ /* '318' */
-			return "time delay & occupancy mode"
+			return "time delay & DHW mode"
 		}
 	case 319:
 		{ /* '319' */
-			return "time delay & building mode"
+			return "time delay & occupancy mode"
 		}
 	case 32:
 		{ /* '32' */
@@ -3151,43 +3157,43 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 320:
 		{ /* '320' */
-			return "Status Lighting Actuator"
+			return "time delay & building mode"
 		}
 	case 321:
 		{ /* '321' */
-			return "DPT version"
+			return "Status Lighting Actuator"
 		}
 	case 322:
 		{ /* '322' */
-			return "alarm info"
+			return "DPT version"
 		}
 	case 323:
 		{ /* '323' */
-			return "room temperature setpoint"
+			return "alarm info"
 		}
 	case 324:
 		{ /* '324' */
-			return "room temperature setpoint shift"
+			return "room temperature setpoint"
 		}
 	case 325:
 		{ /* '325' */
-			return "scaling speed"
+			return "room temperature setpoint shift"
 		}
 	case 326:
 		{ /* '326' */
-			return "scaling step time"
+			return "scaling speed"
 		}
 	case 327:
 		{ /* '327' */
-			return "metering value (value,encoding,cmd)"
+			return "scaling step time"
 		}
 	case 328:
 		{ /* '328' */
-			return "MBus address"
+			return "metering value (value,encoding,cmd)"
 		}
 	case 329:
 		{ /* '329' */
-			return "RGB value 3x(0..255)"
+			return "MBus address"
 		}
 	case 33:
 		{ /* '33' */
@@ -3195,19 +3201,19 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 330:
 		{ /* '330' */
-			return "language code (ASCII)"
+			return "RGB value 3x(0..255)"
 		}
 	case 331:
 		{ /* '331' */
-			return "electrical energy with tariff"
+			return "language code (ASCII)"
 		}
 	case 332:
 		{ /* '332' */
-			return "priority control"
+			return "electrical energy with tariff"
 		}
 	case 333:
 		{ /* '333' */
-			return "diagnostic value"
+			return "priority control"
 		}
 	case 334:
 		{ /* '334' */
@@ -3215,23 +3221,23 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 335:
 		{ /* '335' */
-			return "combined position"
+			return "diagnostic value"
 		}
 	case 336:
 		{ /* '336' */
-			return "status sunblind & shutter actuator"
+			return "combined position"
 		}
 	case 337:
 		{ /* '337' */
-			return "colour xyY"
+			return "status sunblind & shutter actuator"
 		}
 	case 338:
 		{ /* '338' */
-			return "DALI converter status"
+			return "colour xyY"
 		}
 	case 339:
 		{ /* '339' */
-			return "DALI converter test result"
+			return "DALI converter status"
 		}
 	case 34:
 		{ /* '34' */
@@ -3239,38 +3245,42 @@ func (e KnxDatapointType) Name() string {
 		}
 	case 340:
 		{ /* '340' */
-			return "Battery Information"
+			return "DALI converter test result"
 		}
 	case 341:
 		{ /* '341' */
-			return "brightness colour temperature transition"
+			return "Battery Information"
 		}
 	case 342:
 		{ /* '342' */
-			return "brightness colour temperature control"
+			return "brightness colour temperature transition"
 		}
 	case 343:
 		{ /* '343' */
-			return "RGBW value 4x(0..100%)"
+			return "brightness colour temperature control"
 		}
 	case 344:
 		{ /* '344' */
-			return "RGBW relative control"
+			return "RGBW value 4x(0..100%)"
 		}
 	case 345:
 		{ /* '345' */
-			return "RGB relative control"
+			return "RGBW relative control"
 		}
 	case 346:
 		{ /* '346' */
-			return "geographical location (longitude and latitude) expressed in degrees"
+			return "RGB relative control"
 		}
 	case 347:
 		{ /* '347' */
-			return "Temperature setpoint setting for 4 HVAC Modes"
+			return "geographical location (longitude and latitude) expressed in degrees"
 		}
 	case 348:
 		{ /* '348' */
+			return "Temperature setpoint setting for 4 HVAC Modes"
+		}
+	case 349:
+		{ /* '349' */
 			return "Temperature setpoint shift setting for 4 HVAC Modes"
 		}
 	case 35:
@@ -4133,11 +4143,11 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 223:
 		{ /* '223' */
-			return KnxDatapointMainType_DPT_ENTRANCE_ACCESS
+			return KnxDatapointMainType_DPT_4_BYTE_FLOAT_VALUE
 		}
 	case 224:
 		{ /* '224' */
-			return KnxDatapointMainType_DPT_CHARACTER_STRING
+			return KnxDatapointMainType_DPT_ENTRANCE_ACCESS
 		}
 	case 225:
 		{ /* '225' */
@@ -4145,19 +4155,19 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 226:
 		{ /* '226' */
-			return KnxDatapointMainType_DPT_SCENE_NUMBER
+			return KnxDatapointMainType_DPT_CHARACTER_STRING
 		}
 	case 227:
 		{ /* '227' */
-			return KnxDatapointMainType_DPT_SCENE_CONTROL
+			return KnxDatapointMainType_DPT_SCENE_NUMBER
 		}
 	case 228:
 		{ /* '228' */
-			return KnxDatapointMainType_DPT_DATE_TIME
+			return KnxDatapointMainType_DPT_SCENE_CONTROL
 		}
 	case 229:
 		{ /* '229' */
-			return KnxDatapointMainType_DPT_1_BYTE
+			return KnxDatapointMainType_DPT_DATE_TIME
 		}
 	case 23:
 		{ /* '23' */
@@ -4405,7 +4415,7 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 285:
 		{ /* '285' */
-			return KnxDatapointMainType_DPT_8_BIT_SET
+			return KnxDatapointMainType_DPT_1_BYTE
 		}
 	case 286:
 		{ /* '286' */
@@ -4465,7 +4475,7 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 299:
 		{ /* '299' */
-			return KnxDatapointMainType_DPT_16_BIT_SET
+			return KnxDatapointMainType_DPT_8_BIT_SET
 		}
 	case 3:
 		{ /* '3' */
@@ -4497,7 +4507,7 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 305:
 		{ /* '305' */
-			return KnxDatapointMainType_DPT_2_BIT_SET
+			return KnxDatapointMainType_DPT_16_BIT_SET
 		}
 	case 306:
 		{ /* '306' */
@@ -4513,7 +4523,7 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 309:
 		{ /* '309' */
-			return KnxDatapointMainType_DPT_2_NIBBLE_SET
+			return KnxDatapointMainType_DPT_2_BIT_SET
 		}
 	case 31:
 		{ /* '31' */
@@ -4521,15 +4531,15 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 310:
 		{ /* '310' */
-			return KnxDatapointMainType_DPT_8_BIT_SET_2
+			return KnxDatapointMainType_DPT_2_NIBBLE_SET
 		}
 	case 311:
 		{ /* '311' */
-			return KnxDatapointMainType_DPT_32_BIT_SET
+			return KnxDatapointMainType_DPT_8_BIT_SET_2
 		}
 	case 312:
 		{ /* '312' */
-			return KnxDatapointMainType_DPT_ELECTRICAL_ENERGY
+			return KnxDatapointMainType_DPT_32_BIT_SET
 		}
 	case 313:
 		{ /* '313' */
@@ -4541,11 +4551,11 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 315:
 		{ /* '315' */
-			return KnxDatapointMainType_DPT_24_TIMES_CHANNEL_ACTIVATION
+			return KnxDatapointMainType_DPT_ELECTRICAL_ENERGY
 		}
 	case 316:
 		{ /* '316' */
-			return KnxDatapointMainType_DPT_16_BIT_UNSIGNED_VALUE_AND_8_BIT_ENUM
+			return KnxDatapointMainType_DPT_24_TIMES_CHANNEL_ACTIVATION
 		}
 	case 317:
 		{ /* '317' */
@@ -4565,19 +4575,19 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 320:
 		{ /* '320' */
-			return KnxDatapointMainType_DPT_8_BIT_UNSIGNED_VALUE_AND_8_BIT_ENUM
+			return KnxDatapointMainType_DPT_16_BIT_UNSIGNED_VALUE_AND_8_BIT_ENUM
 		}
 	case 321:
 		{ /* '321' */
-			return KnxDatapointMainType_DPT_DATAPOINT_TYPE_VERSION
+			return KnxDatapointMainType_DPT_8_BIT_UNSIGNED_VALUE_AND_8_BIT_ENUM
 		}
 	case 322:
 		{ /* '322' */
-			return KnxDatapointMainType_DPT_ALARM_INFO
+			return KnxDatapointMainType_DPT_DATAPOINT_TYPE_VERSION
 		}
 	case 323:
 		{ /* '323' */
-			return KnxDatapointMainType_DPT_3X_2_BYTE_FLOAT_VALUE
+			return KnxDatapointMainType_DPT_ALARM_INFO
 		}
 	case 324:
 		{ /* '324' */
@@ -4585,7 +4595,7 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 325:
 		{ /* '325' */
-			return KnxDatapointMainType_DPT_SCALING_SPEED
+			return KnxDatapointMainType_DPT_3X_2_BYTE_FLOAT_VALUE
 		}
 	case 326:
 		{ /* '326' */
@@ -4593,15 +4603,15 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 327:
 		{ /* '327' */
-			return KnxDatapointMainType_DPT_4_1_1_BYTE_COMBINED_INFORMATION
+			return KnxDatapointMainType_DPT_SCALING_SPEED
 		}
 	case 328:
 		{ /* '328' */
-			return KnxDatapointMainType_DPT_MBUS_ADDRESS
+			return KnxDatapointMainType_DPT_4_1_1_BYTE_COMBINED_INFORMATION
 		}
 	case 329:
 		{ /* '329' */
-			return KnxDatapointMainType_DPT_3_BYTE_COLOUR_RGB
+			return KnxDatapointMainType_DPT_MBUS_ADDRESS
 		}
 	case 33:
 		{ /* '33' */
@@ -4609,43 +4619,43 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 330:
 		{ /* '330' */
-			return KnxDatapointMainType_DPT_LANGUAGE_CODE_ISO_639_1
+			return KnxDatapointMainType_DPT_3_BYTE_COLOUR_RGB
 		}
 	case 331:
 		{ /* '331' */
-			return KnxDatapointMainType_DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY
+			return KnxDatapointMainType_DPT_LANGUAGE_CODE_ISO_639_1
 		}
 	case 332:
 		{ /* '332' */
-			return KnxDatapointMainType_DPT_PRIORITISED_MODE_CONTROL
+			return KnxDatapointMainType_DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY
 		}
 	case 333:
 		{ /* '333' */
-			return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_16_BIT
+			return KnxDatapointMainType_DPT_PRIORITISED_MODE_CONTROL
 		}
 	case 334:
 		{ /* '334' */
-			return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_8_BIT
+			return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_16_BIT
 		}
 	case 335:
 		{ /* '335' */
-			return KnxDatapointMainType_DPT_POSITIONS
+			return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_8_BIT
 		}
 	case 336:
 		{ /* '336' */
-			return KnxDatapointMainType_DPT_STATUS_32_BIT
+			return KnxDatapointMainType_DPT_POSITIONS
 		}
 	case 337:
 		{ /* '337' */
-			return KnxDatapointMainType_DPT_STATUS_48_BIT
+			return KnxDatapointMainType_DPT_STATUS_32_BIT
 		}
 	case 338:
 		{ /* '338' */
-			return KnxDatapointMainType_DPT_CONVERTER_STATUS
+			return KnxDatapointMainType_DPT_STATUS_48_BIT
 		}
 	case 339:
 		{ /* '339' */
-			return KnxDatapointMainType_DPT_CONVERTER_TEST_RESULT
+			return KnxDatapointMainType_DPT_CONVERTER_STATUS
 		}
 	case 34:
 		{ /* '34' */
@@ -4653,40 +4663,44 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
 		}
 	case 340:
 		{ /* '340' */
-			return KnxDatapointMainType_DPT_BATTERY_INFORMATION
+			return KnxDatapointMainType_DPT_CONVERTER_TEST_RESULT
 		}
 	case 341:
 		{ /* '341' */
-			return KnxDatapointMainType_DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION
+			return KnxDatapointMainType_DPT_BATTERY_INFORMATION
 		}
 	case 342:
 		{ /* '342' */
-			return KnxDatapointMainType_DPT_STATUS_24_BIT
+			return KnxDatapointMainType_DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION
 		}
 	case 343:
 		{ /* '343' */
-			return KnxDatapointMainType_DPT_COLOUR_RGBW
+			return KnxDatapointMainType_DPT_STATUS_24_BIT
 		}
 	case 344:
 		{ /* '344' */
-			return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGBW
+			return KnxDatapointMainType_DPT_COLOUR_RGBW
 		}
 	case 345:
 		{ /* '345' */
-			return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGB
+			return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGBW
 		}
 	case 346:
 		{ /* '346' */
-			return KnxDatapointMainType_DPT_F32F32
+			return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGB
 		}
 	case 347:
 		{ /* '347' */
-			return KnxDatapointMainType_DPT_F16F16F16F16
+			return KnxDatapointMainType_DPT_F32F32
 		}
 	case 348:
 		{ /* '348' */
 			return KnxDatapointMainType_DPT_F16F16F16F16
 		}
+	case 349:
+		{ /* '349' */
+			return KnxDatapointMainType_DPT_F16F16F16F16
+		}
 	case 35:
 		{ /* '35' */
 			return KnxDatapointMainType_DPT_1_BIT
@@ -5263,286 +5277,288 @@ func KnxDatapointTypeByValue(value uint32) (enum KnxDatapointType, ok bool) {
 	case 220:
 		return KnxDatapointType_DPT_Value_Work, true
 	case 221:
-		return KnxDatapointType_DPT_Volume_Flux_Meter, true
+		return KnxDatapointType_DPT_Value_ApparentPower, true
 	case 222:
-		return KnxDatapointType_DPT_Volume_Flux_ls, true
+		return KnxDatapointType_DPT_Volume_Flux_Meter, true
 	case 223:
-		return KnxDatapointType_DPT_Access_Data, true
+		return KnxDatapointType_DPT_Volume_Flux_ls, true
 	case 224:
-		return KnxDatapointType_DPT_String_ASCII, true
+		return KnxDatapointType_DPT_Access_Data, true
 	case 225:
-		return KnxDatapointType_DPT_String_8859_1, true
+		return KnxDatapointType_DPT_String_ASCII, true
 	case 226:
-		return KnxDatapointType_DPT_SceneNumber, true
+		return KnxDatapointType_DPT_String_8859_1, true
 	case 227:
-		return KnxDatapointType_DPT_SceneControl, true
+		return KnxDatapointType_DPT_SceneNumber, true
 	case 228:
-		return KnxDatapointType_DPT_DateTime, true
+		return KnxDatapointType_DPT_SceneControl, true
 	case 229:
-		return KnxDatapointType_DPT_SCLOMode, true
+		return KnxDatapointType_DPT_DateTime, true
 	case 23:
 		return KnxDatapointType_TIME_OF_DAY, true
 	case 230:
-		return KnxDatapointType_DPT_BuildingMode, true
+		return KnxDatapointType_DPT_SCLOMode, true
 	case 231:
-		return KnxDatapointType_DPT_OccMode, true
+		return KnxDatapointType_DPT_BuildingMode, true
 	case 232:
-		return KnxDatapointType_DPT_Priority, true
+		return KnxDatapointType_DPT_OccMode, true
 	case 233:
-		return KnxDatapointType_DPT_LightApplicationMode, true
+		return KnxDatapointType_DPT_Priority, true
 	case 234:
-		return KnxDatapointType_DPT_ApplicationArea, true
+		return KnxDatapointType_DPT_LightApplicationMode, true
 	case 235:
-		return KnxDatapointType_DPT_AlarmClassType, true
+		return KnxDatapointType_DPT_ApplicationArea, true
 	case 236:
-		return KnxDatapointType_DPT_PSUMode, true
+		return KnxDatapointType_DPT_AlarmClassType, true
 	case 237:
-		return KnxDatapointType_DPT_ErrorClass_System, true
+		return KnxDatapointType_DPT_PSUMode, true
 	case 238:
-		return KnxDatapointType_DPT_ErrorClass_HVAC, true
+		return KnxDatapointType_DPT_ErrorClass_System, true
 	case 239:
-		return KnxDatapointType_DPT_Time_Delay, true
+		return KnxDatapointType_DPT_ErrorClass_HVAC, true
 	case 24:
 		return KnxDatapointType_TOD, true
 	case 240:
-		return KnxDatapointType_DPT_Beaufort_Wind_Force_Scale, true
+		return KnxDatapointType_DPT_Time_Delay, true
 	case 241:
-		return KnxDatapointType_DPT_SensorSelect, true
+		return KnxDatapointType_DPT_Beaufort_Wind_Force_Scale, true
 	case 242:
-		return KnxDatapointType_DPT_ActuatorConnectType, true
+		return KnxDatapointType_DPT_SensorSelect, true
 	case 243:
-		return KnxDatapointType_DPT_Cloud_Cover, true
+		return KnxDatapointType_DPT_ActuatorConnectType, true
 	case 244:
-		return KnxDatapointType_DPT_PowerReturnMode, true
+		return KnxDatapointType_DPT_Cloud_Cover, true
 	case 245:
-		return KnxDatapointType_DPT_FuelType, true
+		return KnxDatapointType_DPT_PowerReturnMode, true
 	case 246:
-		return KnxDatapointType_DPT_BurnerType, true
+		return KnxDatapointType_DPT_FuelType, true
 	case 247:
-		return KnxDatapointType_DPT_HVACMode, true
+		return KnxDatapointType_DPT_BurnerType, true
 	case 248:
-		return KnxDatapointType_DPT_DHWMode, true
+		return KnxDatapointType_DPT_HVACMode, true
 	case 249:
-		return KnxDatapointType_DPT_LoadPriority, true
+		return KnxDatapointType_DPT_DHWMode, true
 	case 25:
 		return KnxDatapointType_DATE_AND_TIME, true
 	case 250:
-		return KnxDatapointType_DPT_HVACContrMode, true
+		return KnxDatapointType_DPT_LoadPriority, true
 	case 251:
-		return KnxDatapointType_DPT_HVACEmergMode, true
+		return KnxDatapointType_DPT_HVACContrMode, true
 	case 252:
-		return KnxDatapointType_DPT_ChangeoverMode, true
+		return KnxDatapointType_DPT_HVACEmergMode, true
 	case 253:
-		return KnxDatapointType_DPT_ValveMode, true
+		return KnxDatapointType_DPT_ChangeoverMode, true
 	case 254:
-		return KnxDatapointType_DPT_DamperMode, true
+		return KnxDatapointType_DPT_ValveMode, true
 	case 255:
-		return KnxDatapointType_DPT_HeaterMode, true
+		return KnxDatapointType_DPT_DamperMode, true
 	case 256:
-		return KnxDatapointType_DPT_FanMode, true
+		return KnxDatapointType_DPT_HeaterMode, true
 	case 257:
-		return KnxDatapointType_DPT_MasterSlaveMode, true
+		return KnxDatapointType_DPT_FanMode, true
 	case 258:
-		return KnxDatapointType_DPT_StatusRoomSetp, true
+		return KnxDatapointType_DPT_MasterSlaveMode, true
 	case 259:
-		return KnxDatapointType_DPT_Metering_DeviceType, true
+		return KnxDatapointType_DPT_StatusRoomSetp, true
 	case 26:
 		return KnxDatapointType_DT, true
 	case 260:
-		return KnxDatapointType_DPT_HumDehumMode, true
+		return KnxDatapointType_DPT_Metering_DeviceType, true
 	case 261:
-		return KnxDatapointType_DPT_EnableHCStage, true
+		return KnxDatapointType_DPT_HumDehumMode, true
 	case 262:
-		return KnxDatapointType_DPT_ADAType, true
+		return KnxDatapointType_DPT_EnableHCStage, true
 	case 263:
-		return KnxDatapointType_DPT_BackupMode, true
+		return KnxDatapointType_DPT_ADAType, true
 	case 264:
-		return KnxDatapointType_DPT_StartSynchronization, true
+		return KnxDatapointType_DPT_BackupMode, true
 	case 265:
-		return KnxDatapointType_DPT_Behaviour_Lock_Unlock, true
+		return KnxDatapointType_DPT_StartSynchronization, true
 	case 266:
-		return KnxDatapointType_DPT_Behaviour_Bus_Power_Up_Down, true
+		return KnxDatapointType_DPT_Behaviour_Lock_Unlock, true
 	case 267:
-		return KnxDatapointType_DPT_DALI_Fade_Time, true
+		return KnxDatapointType_DPT_Behaviour_Bus_Power_Up_Down, true
 	case 268:
-		return KnxDatapointType_DPT_BlinkingMode, true
+		return KnxDatapointType_DPT_DALI_Fade_Time, true
 	case 269:
-		return KnxDatapointType_DPT_LightControlMode, true
+		return KnxDatapointType_DPT_BlinkingMode, true
 	case 27:
 		return KnxDatapointType_DPT_Switch, true
 	case 270:
-		return KnxDatapointType_DPT_SwitchPBModel, true
+		return KnxDatapointType_DPT_LightControlMode, true
 	case 271:
-		return KnxDatapointType_DPT_PBAction, true
+		return KnxDatapointType_DPT_SwitchPBModel, true
 	case 272:
-		return KnxDatapointType_DPT_DimmPBModel, true
+		return KnxDatapointType_DPT_PBAction, true
 	case 273:
-		return KnxDatapointType_DPT_SwitchOnMode, true
+		return KnxDatapointType_DPT_DimmPBModel, true
 	case 274:
-		return KnxDatapointType_DPT_LoadTypeSet, true
+		return KnxDatapointType_DPT_SwitchOnMode, true
 	case 275:
-		return KnxDatapointType_DPT_LoadTypeDetected, true
+		return KnxDatapointType_DPT_LoadTypeSet, true
 	case 276:
-		return KnxDatapointType_DPT_Converter_Test_Control, true
+		return KnxDatapointType_DPT_LoadTypeDetected, true
 	case 277:
-		return KnxDatapointType_DPT_SABExcept_Behaviour, true
+		return KnxDatapointType_DPT_Converter_Test_Control, true
 	case 278:
-		return KnxDatapointType_DPT_SABBehaviour_Lock_Unlock, true
+		return KnxDatapointType_DPT_SABExcept_Behaviour, true
 	case 279:
-		return KnxDatapointType_DPT_SSSBMode, true
+		return KnxDatapointType_DPT_SABBehaviour_Lock_Unlock, true
 	case 28:
 		return KnxDatapointType_DPT_Bool, true
 	case 280:
-		return KnxDatapointType_DPT_BlindsControlMode, true
+		return KnxDatapointType_DPT_SSSBMode, true
 	case 281:
-		return KnxDatapointType_DPT_CommMode, true
+		return KnxDatapointType_DPT_BlindsControlMode, true
 	case 282:
-		return KnxDatapointType_DPT_AddInfoTypes, true
+		return KnxDatapointType_DPT_CommMode, true
 	case 283:
-		return KnxDatapointType_DPT_RF_ModeSelect, true
+		return KnxDatapointType_DPT_AddInfoTypes, true
 	case 284:
-		return KnxDatapointType_DPT_RF_FilterSelect, true
+		return KnxDatapointType_DPT_RF_ModeSelect, true
 	case 285:
-		return KnxDatapointType_DPT_StatusGen, true
+		return KnxDatapointType_DPT_RF_FilterSelect, true
 	case 286:
-		return KnxDatapointType_DPT_Device_Control, true
+		return KnxDatapointType_DPT_StatusGen, true
 	case 287:
-		return KnxDatapointType_DPT_ForceSign, true
+		return KnxDatapointType_DPT_Device_Control, true
 	case 288:
-		return KnxDatapointType_DPT_ForceSignCool, true
+		return KnxDatapointType_DPT_ForceSign, true
 	case 289:
-		return KnxDatapointType_DPT_StatusRHC, true
+		return KnxDatapointType_DPT_ForceSignCool, true
 	case 29:
 		return KnxDatapointType_DPT_Enable, true
 	case 290:
-		return KnxDatapointType_DPT_StatusSDHWC, true
+		return KnxDatapointType_DPT_StatusRHC, true
 	case 291:
-		return KnxDatapointType_DPT_FuelTypeSet, true
+		return KnxDatapointType_DPT_StatusSDHWC, true
 	case 292:
-		return KnxDatapointType_DPT_StatusRCC, true
+		return KnxDatapointType_DPT_FuelTypeSet, true
 	case 293:
-		return KnxDatapointType_DPT_StatusAHU, true
+		return KnxDatapointType_DPT_StatusRCC, true
 	case 294:
-		return KnxDatapointType_DPT_CombinedStatus_RTSM, true
+		return KnxDatapointType_DPT_StatusAHU, true
 	case 295:
-		return KnxDatapointType_DPT_LightActuatorErrorInfo, true
+		return KnxDatapointType_DPT_CombinedStatus_RTSM, true
 	case 296:
-		return KnxDatapointType_DPT_RF_ModeInfo, true
+		return KnxDatapointType_DPT_LightActuatorErrorInfo, true
 	case 297:
-		return KnxDatapointType_DPT_RF_FilterInfo, true
+		return KnxDatapointType_DPT_RF_ModeInfo, true
 	case 298:
-		return KnxDatapointType_DPT_Channel_Activation_8, true
+		return KnxDatapointType_DPT_RF_FilterInfo, true
 	case 299:
-		return KnxDatapointType_DPT_StatusDHWC, true
+		return KnxDatapointType_DPT_Channel_Activation_8, true
 	case 3:
 		return KnxDatapointType_WORD, true
 	case 30:
 		return KnxDatapointType_DPT_Ramp, true
 	case 300:
-		return KnxDatapointType_DPT_StatusRHCC, true
+		return KnxDatapointType_DPT_StatusDHWC, true
 	case 301:
-		return KnxDatapointType_DPT_CombinedStatus_HVA, true
+		return KnxDatapointType_DPT_StatusRHCC, true
 	case 302:
-		return KnxDatapointType_DPT_CombinedStatus_RTC, true
+		return KnxDatapointType_DPT_CombinedStatus_HVA, true
 	case 303:
-		return KnxDatapointType_DPT_Media, true
+		return KnxDatapointType_DPT_CombinedStatus_RTC, true
 	case 304:
-		return KnxDatapointType_DPT_Channel_Activation_16, true
+		return KnxDatapointType_DPT_Media, true
 	case 305:
-		return KnxDatapointType_DPT_OnOffAction, true
+		return KnxDatapointType_DPT_Channel_Activation_16, true
 	case 306:
-		return KnxDatapointType_DPT_Alarm_Reaction, true
+		return KnxDatapointType_DPT_OnOffAction, true
 	case 307:
-		return KnxDatapointType_DPT_UpDown_Action, true
+		return KnxDatapointType_DPT_Alarm_Reaction, true
 	case 308:
-		return KnxDatapointType_DPT_HVAC_PB_Action, true
+		return KnxDatapointType_DPT_UpDown_Action, true
 	case 309:
-		return KnxDatapointType_DPT_DoubleNibble, true
+		return KnxDatapointType_DPT_HVAC_PB_Action, true
 	case 31:
 		return KnxDatapointType_DPT_Alarm, true
 	case 310:
-		return KnxDatapointType_DPT_SceneInfo, true
+		return KnxDatapointType_DPT_DoubleNibble, true
 	case 311:
-		return KnxDatapointType_DPT_CombinedInfoOnOff, true
+		return KnxDatapointType_DPT_SceneInfo, true
 	case 312:
-		return KnxDatapointType_DPT_ActiveEnergy_V64, true
+		return KnxDatapointType_DPT_CombinedInfoOnOff, true
 	case 313:
-		return KnxDatapointType_DPT_ApparantEnergy_V64, true
+		return KnxDatapointType_DPT_ActiveEnergy_V64, true
 	case 314:
-		return KnxDatapointType_DPT_ReactiveEnergy_V64, true
+		return KnxDatapointType_DPT_ApparantEnergy_V64, true
 	case 315:
-		return KnxDatapointType_DPT_Channel_Activation_24, true
+		return KnxDatapointType_DPT_ReactiveEnergy_V64, true
 	case 316:
-		return KnxDatapointType_DPT_HVACModeNext, true
+		return KnxDatapointType_DPT_Channel_Activation_24, true
 	case 317:
-		return KnxDatapointType_DPT_DHWModeNext, true
+		return KnxDatapointType_DPT_HVACModeNext, true
 	case 318:
-		return KnxDatapointType_DPT_OccModeNext, true
+		return KnxDatapointType_DPT_DHWModeNext, true
 	case 319:
-		return KnxDatapointType_DPT_BuildingModeNext, true
+		return KnxDatapointType_DPT_OccModeNext, true
 	case 32:
 		return KnxDatapointType_DPT_BinaryValue, true
 	case 320:
-		return KnxDatapointType_DPT_StatusLightingActuator, true
+		return KnxDatapointType_DPT_BuildingModeNext, true
 	case 321:
-		return KnxDatapointType_DPT_Version, true
+		return KnxDatapointType_DPT_StatusLightingActuator, true
 	case 322:
-		return KnxDatapointType_DPT_AlarmInfo, true
+		return KnxDatapointType_DPT_Version, true
 	case 323:
-		return KnxDatapointType_DPT_TempRoomSetpSetF16_3, true
+		return KnxDatapointType_DPT_AlarmInfo, true
 	case 324:
-		return KnxDatapointType_DPT_TempRoomSetpSetShiftF16_3, true
+		return KnxDatapointType_DPT_TempRoomSetpSetF16_3, true
 	case 325:
-		return KnxDatapointType_DPT_Scaling_Speed, true
+		return KnxDatapointType_DPT_TempRoomSetpSetShiftF16_3, true
 	case 326:
-		return KnxDatapointType_DPT_Scaling_Step_Time, true
+		return KnxDatapointType_DPT_Scaling_Speed, true
 	case 327:
-		return KnxDatapointType_DPT_MeteringValue, true
+		return KnxDatapointType_DPT_Scaling_Step_Time, true
 	case 328:
-		return KnxDatapointType_DPT_MBus_Address, true
+		return KnxDatapointType_DPT_MeteringValue, true
 	case 329:
-		return KnxDatapointType_DPT_Colour_RGB, true
+		return KnxDatapointType_DPT_MBus_Address, true
 	case 33:
 		return KnxDatapointType_DPT_Step, true
 	case 330:
-		return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
+		return KnxDatapointType_DPT_Colour_RGB, true
 	case 331:
-		return KnxDatapointType_DPT_Tariff_ActiveEnergy, true
+		return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
 	case 332:
-		return KnxDatapointType_DPT_Prioritised_Mode_Control, true
+		return KnxDatapointType_DPT_Tariff_ActiveEnergy, true
 	case 333:
-		return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
+		return KnxDatapointType_DPT_Prioritised_Mode_Control, true
 	case 334:
-		return KnxDatapointType_DPT_DALI_Diagnostics, true
+		return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
 	case 335:
-		return KnxDatapointType_DPT_CombinedPosition, true
+		return KnxDatapointType_DPT_DALI_Diagnostics, true
 	case 336:
-		return KnxDatapointType_DPT_StatusSAB, true
+		return KnxDatapointType_DPT_CombinedPosition, true
 	case 337:
-		return KnxDatapointType_DPT_Colour_xyY, true
+		return KnxDatapointType_DPT_StatusSAB, true
 	case 338:
-		return KnxDatapointType_DPT_Converter_Status, true
+		return KnxDatapointType_DPT_Colour_xyY, true
 	case 339:
-		return KnxDatapointType_DPT_Converter_Test_Result, true
+		return KnxDatapointType_DPT_Converter_Status, true
 	case 34:
 		return KnxDatapointType_DPT_UpDown, true
 	case 340:
-		return KnxDatapointType_DPT_Battery_Info, true
+		return KnxDatapointType_DPT_Converter_Test_Result, true
 	case 341:
-		return KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition, true
+		return KnxDatapointType_DPT_Battery_Info, true
 	case 342:
-		return KnxDatapointType_DPT_Brightness_Colour_Temperature_Control, true
+		return KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition, true
 	case 343:
-		return KnxDatapointType_DPT_Colour_RGBW, true
+		return KnxDatapointType_DPT_Brightness_Colour_Temperature_Control, true
 	case 344:
-		return KnxDatapointType_DPT_Relative_Control_RGBW, true
+		return KnxDatapointType_DPT_Colour_RGBW, true
 	case 345:
-		return KnxDatapointType_DPT_Relative_Control_RGB, true
+		return KnxDatapointType_DPT_Relative_Control_RGBW, true
 	case 346:
-		return KnxDatapointType_DPT_GeographicalLocation, true
+		return KnxDatapointType_DPT_Relative_Control_RGB, true
 	case 347:
-		return KnxDatapointType_DPT_TempRoomSetpSetF16_4, true
+		return KnxDatapointType_DPT_GeographicalLocation, true
 	case 348:
+		return KnxDatapointType_DPT_TempRoomSetpSetF16_4, true
+	case 349:
 		return KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4, true
 	case 35:
 		return KnxDatapointType_DPT_OpenClose, true
@@ -5966,6 +5982,8 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DATE, true
 	case "DPT_Value_Work":
 		return KnxDatapointType_DPT_Value_Work, true
+	case "DPT_Value_ApparentPower":
+		return KnxDatapointType_DPT_Value_ApparentPower, true
 	case "DPT_Volume_Flux_Meter":
 		return KnxDatapointType_DPT_Volume_Flux_Meter, true
 	case "DPT_Volume_Flux_ls":
@@ -5982,10 +6000,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_SceneControl, true
 	case "DPT_DateTime":
 		return KnxDatapointType_DPT_DateTime, true
-	case "DPT_SCLOMode":
-		return KnxDatapointType_DPT_SCLOMode, true
 	case "TIME_OF_DAY":
 		return KnxDatapointType_TIME_OF_DAY, true
+	case "DPT_SCLOMode":
+		return KnxDatapointType_DPT_SCLOMode, true
 	case "DPT_BuildingMode":
 		return KnxDatapointType_DPT_BuildingMode, true
 	case "DPT_OccMode":
@@ -6004,10 +6022,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_ErrorClass_System, true
 	case "DPT_ErrorClass_HVAC":
 		return KnxDatapointType_DPT_ErrorClass_HVAC, true
-	case "DPT_Time_Delay":
-		return KnxDatapointType_DPT_Time_Delay, true
 	case "TOD":
 		return KnxDatapointType_TOD, true
+	case "DPT_Time_Delay":
+		return KnxDatapointType_DPT_Time_Delay, true
 	case "DPT_Beaufort_Wind_Force_Scale":
 		return KnxDatapointType_DPT_Beaufort_Wind_Force_Scale, true
 	case "DPT_SensorSelect":
@@ -6026,10 +6044,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_HVACMode, true
 	case "DPT_DHWMode":
 		return KnxDatapointType_DPT_DHWMode, true
-	case "DPT_LoadPriority":
-		return KnxDatapointType_DPT_LoadPriority, true
 	case "DATE_AND_TIME":
 		return KnxDatapointType_DATE_AND_TIME, true
+	case "DPT_LoadPriority":
+		return KnxDatapointType_DPT_LoadPriority, true
 	case "DPT_HVACContrMode":
 		return KnxDatapointType_DPT_HVACContrMode, true
 	case "DPT_HVACEmergMode":
@@ -6048,10 +6066,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_MasterSlaveMode, true
 	case "DPT_StatusRoomSetp":
 		return KnxDatapointType_DPT_StatusRoomSetp, true
-	case "DPT_Metering_DeviceType":
-		return KnxDatapointType_DPT_Metering_DeviceType, true
 	case "DT":
 		return KnxDatapointType_DT, true
+	case "DPT_Metering_DeviceType":
+		return KnxDatapointType_DPT_Metering_DeviceType, true
 	case "DPT_HumDehumMode":
 		return KnxDatapointType_DPT_HumDehumMode, true
 	case "DPT_EnableHCStage":
@@ -6070,10 +6088,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_DALI_Fade_Time, true
 	case "DPT_BlinkingMode":
 		return KnxDatapointType_DPT_BlinkingMode, true
-	case "DPT_LightControlMode":
-		return KnxDatapointType_DPT_LightControlMode, true
 	case "DPT_Switch":
 		return KnxDatapointType_DPT_Switch, true
+	case "DPT_LightControlMode":
+		return KnxDatapointType_DPT_LightControlMode, true
 	case "DPT_SwitchPBModel":
 		return KnxDatapointType_DPT_SwitchPBModel, true
 	case "DPT_PBAction":
@@ -6092,10 +6110,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_SABExcept_Behaviour, true
 	case "DPT_SABBehaviour_Lock_Unlock":
 		return KnxDatapointType_DPT_SABBehaviour_Lock_Unlock, true
-	case "DPT_SSSBMode":
-		return KnxDatapointType_DPT_SSSBMode, true
 	case "DPT_Bool":
 		return KnxDatapointType_DPT_Bool, true
+	case "DPT_SSSBMode":
+		return KnxDatapointType_DPT_SSSBMode, true
 	case "DPT_BlindsControlMode":
 		return KnxDatapointType_DPT_BlindsControlMode, true
 	case "DPT_CommMode":
@@ -6114,10 +6132,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_ForceSign, true
 	case "DPT_ForceSignCool":
 		return KnxDatapointType_DPT_ForceSignCool, true
-	case "DPT_StatusRHC":
-		return KnxDatapointType_DPT_StatusRHC, true
 	case "DPT_Enable":
 		return KnxDatapointType_DPT_Enable, true
+	case "DPT_StatusRHC":
+		return KnxDatapointType_DPT_StatusRHC, true
 	case "DPT_StatusSDHWC":
 		return KnxDatapointType_DPT_StatusSDHWC, true
 	case "DPT_FuelTypeSet":
@@ -6136,12 +6154,12 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_RF_FilterInfo, true
 	case "DPT_Channel_Activation_8":
 		return KnxDatapointType_DPT_Channel_Activation_8, true
-	case "DPT_StatusDHWC":
-		return KnxDatapointType_DPT_StatusDHWC, true
 	case "WORD":
 		return KnxDatapointType_WORD, true
 	case "DPT_Ramp":
 		return KnxDatapointType_DPT_Ramp, true
+	case "DPT_StatusDHWC":
+		return KnxDatapointType_DPT_StatusDHWC, true
 	case "DPT_StatusRHCC":
 		return KnxDatapointType_DPT_StatusRHCC, true
 	case "DPT_CombinedStatus_HVA":
@@ -6160,10 +6178,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_UpDown_Action, true
 	case "DPT_HVAC_PB_Action":
 		return KnxDatapointType_DPT_HVAC_PB_Action, true
-	case "DPT_DoubleNibble":
-		return KnxDatapointType_DPT_DoubleNibble, true
 	case "DPT_Alarm":
 		return KnxDatapointType_DPT_Alarm, true
+	case "DPT_DoubleNibble":
+		return KnxDatapointType_DPT_DoubleNibble, true
 	case "DPT_SceneInfo":
 		return KnxDatapointType_DPT_SceneInfo, true
 	case "DPT_CombinedInfoOnOff":
@@ -6182,10 +6200,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_DHWModeNext, true
 	case "DPT_OccModeNext":
 		return KnxDatapointType_DPT_OccModeNext, true
-	case "DPT_BuildingModeNext":
-		return KnxDatapointType_DPT_BuildingModeNext, true
 	case "DPT_BinaryValue":
 		return KnxDatapointType_DPT_BinaryValue, true
+	case "DPT_BuildingModeNext":
+		return KnxDatapointType_DPT_BuildingModeNext, true
 	case "DPT_StatusLightingActuator":
 		return KnxDatapointType_DPT_StatusLightingActuator, true
 	case "DPT_Version":
@@ -6204,10 +6222,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_MeteringValue, true
 	case "DPT_MBus_Address":
 		return KnxDatapointType_DPT_MBus_Address, true
-	case "DPT_Colour_RGB":
-		return KnxDatapointType_DPT_Colour_RGB, true
 	case "DPT_Step":
 		return KnxDatapointType_DPT_Step, true
+	case "DPT_Colour_RGB":
+		return KnxDatapointType_DPT_Colour_RGB, true
 	case "DPT_LanguageCodeAlpha2_ASCII":
 		return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
 	case "DPT_Tariff_ActiveEnergy":
@@ -6226,10 +6244,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
 		return KnxDatapointType_DPT_Colour_xyY, true
 	case "DPT_Converter_Status":
 		return KnxDatapointType_DPT_Converter_Status, true
-	case "DPT_Converter_Test_Result":
-		return KnxDatapointType_DPT_Converter_Test_Result, true
 	case "DPT_UpDown":
 		return KnxDatapointType_DPT_UpDown, true
+	case "DPT_Converter_Test_Result":
+		return KnxDatapointType_DPT_Converter_Test_Result, true
 	case "DPT_Battery_Info":
 		return KnxDatapointType_DPT_Battery_Info, true
 	case "DPT_Brightness_Colour_Temperature_Transition":
@@ -6727,6 +6745,8 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DATE"
 	case KnxDatapointType_DPT_Value_Work:
 		return "DPT_Value_Work"
+	case KnxDatapointType_DPT_Value_ApparentPower:
+		return "DPT_Value_ApparentPower"
 	case KnxDatapointType_DPT_Volume_Flux_Meter:
 		return "DPT_Volume_Flux_Meter"
 	case KnxDatapointType_DPT_Volume_Flux_ls:
@@ -6743,10 +6763,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_SceneControl"
 	case KnxDatapointType_DPT_DateTime:
 		return "DPT_DateTime"
-	case KnxDatapointType_DPT_SCLOMode:
-		return "DPT_SCLOMode"
 	case KnxDatapointType_TIME_OF_DAY:
 		return "TIME_OF_DAY"
+	case KnxDatapointType_DPT_SCLOMode:
+		return "DPT_SCLOMode"
 	case KnxDatapointType_DPT_BuildingMode:
 		return "DPT_BuildingMode"
 	case KnxDatapointType_DPT_OccMode:
@@ -6765,10 +6785,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_ErrorClass_System"
 	case KnxDatapointType_DPT_ErrorClass_HVAC:
 		return "DPT_ErrorClass_HVAC"
-	case KnxDatapointType_DPT_Time_Delay:
-		return "DPT_Time_Delay"
 	case KnxDatapointType_TOD:
 		return "TOD"
+	case KnxDatapointType_DPT_Time_Delay:
+		return "DPT_Time_Delay"
 	case KnxDatapointType_DPT_Beaufort_Wind_Force_Scale:
 		return "DPT_Beaufort_Wind_Force_Scale"
 	case KnxDatapointType_DPT_SensorSelect:
@@ -6787,10 +6807,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_HVACMode"
 	case KnxDatapointType_DPT_DHWMode:
 		return "DPT_DHWMode"
-	case KnxDatapointType_DPT_LoadPriority:
-		return "DPT_LoadPriority"
 	case KnxDatapointType_DATE_AND_TIME:
 		return "DATE_AND_TIME"
+	case KnxDatapointType_DPT_LoadPriority:
+		return "DPT_LoadPriority"
 	case KnxDatapointType_DPT_HVACContrMode:
 		return "DPT_HVACContrMode"
 	case KnxDatapointType_DPT_HVACEmergMode:
@@ -6809,10 +6829,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_MasterSlaveMode"
 	case KnxDatapointType_DPT_StatusRoomSetp:
 		return "DPT_StatusRoomSetp"
-	case KnxDatapointType_DPT_Metering_DeviceType:
-		return "DPT_Metering_DeviceType"
 	case KnxDatapointType_DT:
 		return "DT"
+	case KnxDatapointType_DPT_Metering_DeviceType:
+		return "DPT_Metering_DeviceType"
 	case KnxDatapointType_DPT_HumDehumMode:
 		return "DPT_HumDehumMode"
 	case KnxDatapointType_DPT_EnableHCStage:
@@ -6831,10 +6851,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_DALI_Fade_Time"
 	case KnxDatapointType_DPT_BlinkingMode:
 		return "DPT_BlinkingMode"
-	case KnxDatapointType_DPT_LightControlMode:
-		return "DPT_LightControlMode"
 	case KnxDatapointType_DPT_Switch:
 		return "DPT_Switch"
+	case KnxDatapointType_DPT_LightControlMode:
+		return "DPT_LightControlMode"
 	case KnxDatapointType_DPT_SwitchPBModel:
 		return "DPT_SwitchPBModel"
 	case KnxDatapointType_DPT_PBAction:
@@ -6853,10 +6873,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_SABExcept_Behaviour"
 	case KnxDatapointType_DPT_SABBehaviour_Lock_Unlock:
 		return "DPT_SABBehaviour_Lock_Unlock"
-	case KnxDatapointType_DPT_SSSBMode:
-		return "DPT_SSSBMode"
 	case KnxDatapointType_DPT_Bool:
 		return "DPT_Bool"
+	case KnxDatapointType_DPT_SSSBMode:
+		return "DPT_SSSBMode"
 	case KnxDatapointType_DPT_BlindsControlMode:
 		return "DPT_BlindsControlMode"
 	case KnxDatapointType_DPT_CommMode:
@@ -6875,10 +6895,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_ForceSign"
 	case KnxDatapointType_DPT_ForceSignCool:
 		return "DPT_ForceSignCool"
-	case KnxDatapointType_DPT_StatusRHC:
-		return "DPT_StatusRHC"
 	case KnxDatapointType_DPT_Enable:
 		return "DPT_Enable"
+	case KnxDatapointType_DPT_StatusRHC:
+		return "DPT_StatusRHC"
 	case KnxDatapointType_DPT_StatusSDHWC:
 		return "DPT_StatusSDHWC"
 	case KnxDatapointType_DPT_FuelTypeSet:
@@ -6897,12 +6917,12 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_RF_FilterInfo"
 	case KnxDatapointType_DPT_Channel_Activation_8:
 		return "DPT_Channel_Activation_8"
-	case KnxDatapointType_DPT_StatusDHWC:
-		return "DPT_StatusDHWC"
 	case KnxDatapointType_WORD:
 		return "WORD"
 	case KnxDatapointType_DPT_Ramp:
 		return "DPT_Ramp"
+	case KnxDatapointType_DPT_StatusDHWC:
+		return "DPT_StatusDHWC"
 	case KnxDatapointType_DPT_StatusRHCC:
 		return "DPT_StatusRHCC"
 	case KnxDatapointType_DPT_CombinedStatus_HVA:
@@ -6921,10 +6941,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_UpDown_Action"
 	case KnxDatapointType_DPT_HVAC_PB_Action:
 		return "DPT_HVAC_PB_Action"
-	case KnxDatapointType_DPT_DoubleNibble:
-		return "DPT_DoubleNibble"
 	case KnxDatapointType_DPT_Alarm:
 		return "DPT_Alarm"
+	case KnxDatapointType_DPT_DoubleNibble:
+		return "DPT_DoubleNibble"
 	case KnxDatapointType_DPT_SceneInfo:
 		return "DPT_SceneInfo"
 	case KnxDatapointType_DPT_CombinedInfoOnOff:
@@ -6943,10 +6963,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_DHWModeNext"
 	case KnxDatapointType_DPT_OccModeNext:
 		return "DPT_OccModeNext"
-	case KnxDatapointType_DPT_BuildingModeNext:
-		return "DPT_BuildingModeNext"
 	case KnxDatapointType_DPT_BinaryValue:
 		return "DPT_BinaryValue"
+	case KnxDatapointType_DPT_BuildingModeNext:
+		return "DPT_BuildingModeNext"
 	case KnxDatapointType_DPT_StatusLightingActuator:
 		return "DPT_StatusLightingActuator"
 	case KnxDatapointType_DPT_Version:
@@ -6965,10 +6985,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_MeteringValue"
 	case KnxDatapointType_DPT_MBus_Address:
 		return "DPT_MBus_Address"
-	case KnxDatapointType_DPT_Colour_RGB:
-		return "DPT_Colour_RGB"
 	case KnxDatapointType_DPT_Step:
 		return "DPT_Step"
+	case KnxDatapointType_DPT_Colour_RGB:
+		return "DPT_Colour_RGB"
 	case KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII:
 		return "DPT_LanguageCodeAlpha2_ASCII"
 	case KnxDatapointType_DPT_Tariff_ActiveEnergy:
@@ -6987,10 +7007,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
 		return "DPT_Colour_xyY"
 	case KnxDatapointType_DPT_Converter_Status:
 		return "DPT_Converter_Status"
-	case KnxDatapointType_DPT_Converter_Test_Result:
-		return "DPT_Converter_Test_Result"
 	case KnxDatapointType_DPT_UpDown:
 		return "DPT_UpDown"
+	case KnxDatapointType_DPT_Converter_Test_Result:
+		return "DPT_Converter_Test_Result"
 	case KnxDatapointType_DPT_Battery_Info:
 		return "DPT_Battery_Info"
 	case KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition:
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 9a873aed61..a67cf1ecd5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -316,7 +316,7 @@ const (
 	KnxManufacturer_M_BELCOM_CABLES_LTD_                                 KnxManufacturer = 277
 	KnxManufacturer_M_GUANGZHOU_SEAWIN_ELECTRICAL_TECHNOLOGIES_CO___LTD_ KnxManufacturer = 278
 	KnxManufacturer_M_ACREL                                              KnxManufacturer = 279
-	KnxManufacturer_M_FRANKE_AQUAROTTER_GMBH                             KnxManufacturer = 280
+	KnxManufacturer_M_KWC_AQUAROTTER_GMBH                                KnxManufacturer = 280
 	KnxManufacturer_M_ORION_SYSTEMS                                      KnxManufacturer = 281
 	KnxManufacturer_M_SCHRACK_TECHNIK_GMBH                               KnxManufacturer = 282
 	KnxManufacturer_M_INSPRID                                            KnxManufacturer = 283
@@ -426,7 +426,7 @@ const (
 	KnxManufacturer_M_CODESYS_GMBH                                       KnxManufacturer = 387
 	KnxManufacturer_M_MOORGEN_DEUTSCHLAND_GMBH                           KnxManufacturer = 388
 	KnxManufacturer_M_CULLMANN_TECH                                      KnxManufacturer = 389
-	KnxManufacturer_M_MERCK_WINDOW_TECHNOLOGIES_B_V_                     KnxManufacturer = 390
+	KnxManufacturer_M_EYRISE_B_V                                         KnxManufacturer = 390
 	KnxManufacturer_M_ABEGO                                              KnxManufacturer = 391
 	KnxManufacturer_M_MYGEKKO                                            KnxManufacturer = 392
 	KnxManufacturer_M_ERGO3_SARL                                         KnxManufacturer = 393
@@ -937,7 +937,7 @@ func init() {
 		KnxManufacturer_M_BELCOM_CABLES_LTD_,
 		KnxManufacturer_M_GUANGZHOU_SEAWIN_ELECTRICAL_TECHNOLOGIES_CO___LTD_,
 		KnxManufacturer_M_ACREL,
-		KnxManufacturer_M_FRANKE_AQUAROTTER_GMBH,
+		KnxManufacturer_M_KWC_AQUAROTTER_GMBH,
 		KnxManufacturer_M_ORION_SYSTEMS,
 		KnxManufacturer_M_SCHRACK_TECHNIK_GMBH,
 		KnxManufacturer_M_INSPRID,
@@ -1047,7 +1047,7 @@ func init() {
 		KnxManufacturer_M_CODESYS_GMBH,
 		KnxManufacturer_M_MOORGEN_DEUTSCHLAND_GMBH,
 		KnxManufacturer_M_CULLMANN_TECH,
-		KnxManufacturer_M_MERCK_WINDOW_TECHNOLOGIES_B_V_,
+		KnxManufacturer_M_EYRISE_B_V,
 		KnxManufacturer_M_ABEGO,
 		KnxManufacturer_M_MYGEKKO,
 		KnxManufacturer_M_ERGO3_SARL,
@@ -4560,7 +4560,7 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 280:
 		{ /* '280' */
-			return "Franke Aquarotter GmbH"
+			return "KWC Aquarotter GmbH"
 		}
 	case 281:
 		{ /* '281' */
@@ -5048,7 +5048,7 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 390:
 		{ /* '390' */
-			return "Merck Window Technologies B.V."
+			return "eyrise B.V"
 		}
 	case 391:
 		{ /* '391' */
@@ -6628,7 +6628,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 28:
 		return KnxManufacturer_M_VIMAR, true
 	case 280:
-		return KnxManufacturer_M_FRANKE_AQUAROTTER_GMBH, true
+		return KnxManufacturer_M_KWC_AQUAROTTER_GMBH, true
 	case 281:
 		return KnxManufacturer_M_ORION_SYSTEMS, true
 	case 282:
@@ -6872,7 +6872,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 39:
 		return KnxManufacturer_M_HERMANN_KLEINHUIS, true
 	case 390:
-		return KnxManufacturer_M_MERCK_WINDOW_TECHNOLOGIES_B_V_, true
+		return KnxManufacturer_M_EYRISE_B_V, true
 	case 391:
 		return KnxManufacturer_M_ABEGO, true
 	case 392:
@@ -7861,8 +7861,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_ACREL, true
 	case "M_VIMAR":
 		return KnxManufacturer_M_VIMAR, true
-	case "M_FRANKE_AQUAROTTER_GMBH":
-		return KnxManufacturer_M_FRANKE_AQUAROTTER_GMBH, true
+	case "M_KWC_AQUAROTTER_GMBH":
+		return KnxManufacturer_M_KWC_AQUAROTTER_GMBH, true
 	case "M_ORION_SYSTEMS":
 		return KnxManufacturer_M_ORION_SYSTEMS, true
 	case "M_SCHRACK_TECHNIK_GMBH":
@@ -8105,8 +8105,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_CULLMANN_TECH, true
 	case "M_HERMANN_KLEINHUIS":
 		return KnxManufacturer_M_HERMANN_KLEINHUIS, true
-	case "M_MERCK_WINDOW_TECHNOLOGIES_B_V_":
-		return KnxManufacturer_M_MERCK_WINDOW_TECHNOLOGIES_B_V_, true
+	case "M_EYRISE_B_V":
+		return KnxManufacturer_M_EYRISE_B_V, true
 	case "M_ABEGO":
 		return KnxManufacturer_M_ABEGO, true
 	case "M_MYGEKKO":
@@ -9152,8 +9152,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_ACREL"
 	case KnxManufacturer_M_VIMAR:
 		return "M_VIMAR"
-	case KnxManufacturer_M_FRANKE_AQUAROTTER_GMBH:
-		return "M_FRANKE_AQUAROTTER_GMBH"
+	case KnxManufacturer_M_KWC_AQUAROTTER_GMBH:
+		return "M_KWC_AQUAROTTER_GMBH"
 	case KnxManufacturer_M_ORION_SYSTEMS:
 		return "M_ORION_SYSTEMS"
 	case KnxManufacturer_M_SCHRACK_TECHNIK_GMBH:
@@ -9396,8 +9396,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_CULLMANN_TECH"
 	case KnxManufacturer_M_HERMANN_KLEINHUIS:
 		return "M_HERMANN_KLEINHUIS"
-	case KnxManufacturer_M_MERCK_WINDOW_TECHNOLOGIES_B_V_:
-		return "M_MERCK_WINDOW_TECHNOLOGIES_B_V_"
+	case KnxManufacturer_M_EYRISE_B_V:
+		return "M_EYRISE_B_V"
 	case KnxManufacturer_M_ABEGO:
 		return "M_ABEGO"
 	case KnxManufacturer_M_MYGEKKO:
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationPacket.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationPacket.java
index d3d4778ef5..1a95811263 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationPacket.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationPacket.java
@@ -45,8 +45,6 @@ public abstract class CIPEncapsulationPacket implements Message {
   protected final long status;
   protected final List<Short> senderContext;
   protected final long options;
-  // Reserved Fields
-  private Long reservedField0;
 
   public CIPEncapsulationPacket(
       long sessionHandle, long status, List<Short> senderContext, long options) {
@@ -128,7 +126,7 @@ public abstract class CIPEncapsulationPacket implements Message {
     // Reserved Field (reserved)
     writeReservedField(
         "reserved",
-        reservedField0 != null ? reservedField0 : (long) 0x00000000,
+        (long) 0x00000000,
         writeUnsignedLong(writeBuffer, 32),
         WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
 
@@ -260,7 +258,6 @@ public abstract class CIPEncapsulationPacket implements Message {
     // Create the instance
     CIPEncapsulationPacket _cIPEncapsulationPacket =
         builder.build(sessionHandle, status, senderContext, options);
-    _cIPEncapsulationPacket.reservedField0 = reservedField0;
     return _cIPEncapsulationPacket;
   }
 
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadRequest.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadRequest.java
index 05f95f96e9..37c73c3e15 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadRequest.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadRequest.java
@@ -116,7 +116,6 @@ public class CIPEncapsulationReadRequest extends CIPEncapsulationPacket implemen
     private final DF1RequestMessage request;
 
     public CIPEncapsulationReadRequestBuilderImpl(DF1RequestMessage request) {
-
       this.request = request;
     }
 
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadResponse.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadResponse.java
index 7d4410c078..1eea1f0bdd 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadResponse.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/CIPEncapsulationReadResponse.java
@@ -45,19 +45,14 @@ public class CIPEncapsulationReadResponse extends CIPEncapsulationPacket impleme
   // Properties.
   protected final DF1ResponseMessage response;
 
-  // Arguments.
-  protected final Integer packetLen;
-
   public CIPEncapsulationReadResponse(
       long sessionHandle,
       long status,
       List<Short> senderContext,
       long options,
-      DF1ResponseMessage response,
-      Integer packetLen) {
+      DF1ResponseMessage response) {
     super(sessionHandle, status, senderContext, options);
     this.response = response;
-    this.packetLen = packetLen;
   }
 
   public DF1ResponseMessage getResponse() {
@@ -113,25 +108,21 @@ public class CIPEncapsulationReadResponse extends CIPEncapsulationPacket impleme
 
     readBuffer.closeContext("CIPEncapsulationReadResponse");
     // Create the instance
-    return new CIPEncapsulationReadResponseBuilderImpl(response, packetLen);
+    return new CIPEncapsulationReadResponseBuilderImpl(response);
   }
 
   public static class CIPEncapsulationReadResponseBuilderImpl
       implements CIPEncapsulationPacket.CIPEncapsulationPacketBuilder {
     private final DF1ResponseMessage response;
-    private final Integer packetLen;
-
-    public CIPEncapsulationReadResponseBuilderImpl(DF1ResponseMessage response, Integer packetLen) {
 
+    public CIPEncapsulationReadResponseBuilderImpl(DF1ResponseMessage response) {
       this.response = response;
-      this.packetLen = packetLen;
     }
 
     public CIPEncapsulationReadResponse build(
         long sessionHandle, long status, List<Short> senderContext, long options) {
       CIPEncapsulationReadResponse cIPEncapsulationReadResponse =
-          new CIPEncapsulationReadResponse(
-              sessionHandle, status, senderContext, options, response, packetLen);
+          new CIPEncapsulationReadResponse(sessionHandle, status, senderContext, options, response);
       return cIPEncapsulationReadResponse;
     }
   }
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandRequestMessage.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandRequestMessage.java
index cc7392060c..a08633c7f0 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandRequestMessage.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandRequestMessage.java
@@ -111,7 +111,6 @@ public class DF1CommandRequestMessage extends DF1RequestMessage implements Messa
     private final DF1RequestCommand command;
 
     public DF1CommandRequestMessageBuilderImpl(DF1RequestCommand command) {
-
       this.command = command;
     }
 
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandResponseMessageProtectedTypedLogicalRead.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandResponseMessageProtectedTypedLogicalRead.java
index 85b11ec0f3..df7ea442b5 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandResponseMessageProtectedTypedLogicalRead.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1CommandResponseMessageProtectedTypedLogicalRead.java
@@ -46,19 +46,14 @@ public class DF1CommandResponseMessageProtectedTypedLogicalRead extends DF1Respo
   // Properties.
   protected final List<Short> data;
 
-  // Arguments.
-  protected final Integer payloadLength;
-
   public DF1CommandResponseMessageProtectedTypedLogicalRead(
       short destinationAddress,
       short sourceAddress,
       short status,
       int transactionCounter,
-      List<Short> data,
-      Integer payloadLength) {
-    super(destinationAddress, sourceAddress, status, transactionCounter, payloadLength);
+      List<Short> data) {
+    super(destinationAddress, sourceAddress, status, transactionCounter);
     this.data = data;
-    this.payloadLength = payloadLength;
   }
 
   public List<Short> getData() {
@@ -108,36 +103,23 @@ public class DF1CommandResponseMessageProtectedTypedLogicalRead extends DF1Respo
 
     readBuffer.closeContext("DF1CommandResponseMessageProtectedTypedLogicalRead");
     // Create the instance
-    return new DF1CommandResponseMessageProtectedTypedLogicalReadBuilderImpl(data, payloadLength);
+    return new DF1CommandResponseMessageProtectedTypedLogicalReadBuilderImpl(data);
   }
 
   public static class DF1CommandResponseMessageProtectedTypedLogicalReadBuilderImpl
       implements DF1ResponseMessage.DF1ResponseMessageBuilder {
     private final List<Short> data;
-    private final Integer payloadLength;
-
-    public DF1CommandResponseMessageProtectedTypedLogicalReadBuilderImpl(
-        List<Short> data, Integer payloadLength) {
 
+    public DF1CommandResponseMessageProtectedTypedLogicalReadBuilderImpl(List<Short> data) {
       this.data = data;
-      this.payloadLength = payloadLength;
     }
 
     public DF1CommandResponseMessageProtectedTypedLogicalRead build(
-        short destinationAddress,
-        short sourceAddress,
-        short status,
-        int transactionCounter,
-        Integer payloadLength) {
+        short destinationAddress, short sourceAddress, short status, int transactionCounter) {
       DF1CommandResponseMessageProtectedTypedLogicalRead
           dF1CommandResponseMessageProtectedTypedLogicalRead =
               new DF1CommandResponseMessageProtectedTypedLogicalRead(
-                  destinationAddress,
-                  sourceAddress,
-                  status,
-                  transactionCounter,
-                  data,
-                  payloadLength);
+                  destinationAddress, sourceAddress, status, transactionCounter, data);
       return dF1CommandResponseMessageProtectedTypedLogicalRead;
     }
   }
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestMessage.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestMessage.java
index 5a98950dcf..07c90024d4 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestMessage.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestMessage.java
@@ -45,8 +45,6 @@ public abstract class DF1RequestMessage implements Message {
   protected final short sourceAddress;
   protected final short status;
   protected final int transactionCounter;
-  // Reserved Fields
-  private Integer reservedField0;
 
   public DF1RequestMessage(
       short destinationAddress, short sourceAddress, short status, int transactionCounter) {
@@ -88,10 +86,7 @@ public abstract class DF1RequestMessage implements Message {
     writeSimpleField("sourceAddress", sourceAddress, writeUnsignedShort(writeBuffer, 8));
 
     // Reserved Field (reserved)
-    writeReservedField(
-        "reserved",
-        reservedField0 != null ? reservedField0 : (int) 0x0000,
-        writeUnsignedInt(writeBuffer, 16));
+    writeReservedField("reserved", (int) 0x0000, writeUnsignedInt(writeBuffer, 16));
 
     // Discriminator Field (commandCode) (Used as input to a switch field)
     writeDiscriminatorField("commandCode", getCommandCode(), writeUnsignedShort(writeBuffer, 8));
@@ -185,7 +180,6 @@ public abstract class DF1RequestMessage implements Message {
     // Create the instance
     DF1RequestMessage _dF1RequestMessage =
         builder.build(destinationAddress, sourceAddress, status, transactionCounter);
-    _dF1RequestMessage.reservedField0 = reservedField0;
     return _dF1RequestMessage;
   }
 
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestProtectedTypedLogicalRead.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestProtectedTypedLogicalRead.java
index 1ddd827306..019b292208 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestProtectedTypedLogicalRead.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1RequestProtectedTypedLogicalRead.java
@@ -173,7 +173,6 @@ public class DF1RequestProtectedTypedLogicalRead extends DF1RequestCommand imple
         short fileType,
         short elementNumber,
         short subElementNumber) {
-
       this.byteSize = byteSize;
       this.fileNumber = fileNumber;
       this.fileType = fileType;
diff --git a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1ResponseMessage.java b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1ResponseMessage.java
index 5a5b2ed5ab..ce68c672e6 100644
--- a/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1ResponseMessage.java
+++ b/plc4j/drivers/ab-eth/src/main/generated/org/apache/plc4x/java/abeth/readwrite/DF1ResponseMessage.java
@@ -46,24 +46,13 @@ public abstract class DF1ResponseMessage implements Message {
   protected final short status;
   protected final int transactionCounter;
 
-  // Arguments.
-  protected final Integer payloadLength;
-  // Reserved Fields
-  private Short reservedField0;
-  private Short reservedField1;
-
   public DF1ResponseMessage(
-      short destinationAddress,
-      short sourceAddress,
-      short status,
-      int transactionCounter,
-      Integer payloadLength) {
+      short destinationAddress, short sourceAddress, short status, int transactionCounter) {
     super();
     this.destinationAddress = destinationAddress;
     this.sourceAddress = sourceAddress;
     this.status = status;
     this.transactionCounter = transactionCounter;
-    this.payloadLength = payloadLength;
   }
 
   public short getDestinationAddress() {
@@ -91,10 +80,7 @@ public abstract class DF1ResponseMessage implements Message {
     writeBuffer.pushContext("DF1ResponseMessage");
 
     // Reserved Field (reserved)
-    writeReservedField(
-        "reserved",
-        reservedField0 != null ? reservedField0 : (short) 0x00,
-        writeUnsignedShort(writeBuffer, 8));
+    writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
 
     // Simple Field (destinationAddress)
     writeSimpleField("destinationAddress", destinationAddress, writeUnsignedShort(writeBuffer, 8));
@@ -103,10 +89,7 @@ public abstract class DF1ResponseMessage implements Message {
     writeSimpleField("sourceAddress", sourceAddress, writeUnsignedShort(writeBuffer, 8));
 
     // Reserved Field (reserved)
-    writeReservedField(
-        "reserved",
-        reservedField1 != null ? reservedField1 : (short) 0x00,
-        writeUnsignedShort(writeBuffer, 8));
+    writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
 
     // Discriminator Field (commandCode) (Used as input to a switch field)
     writeDiscriminatorField("commandCode", getCommandCode(), writeUnsignedShort(writeBuffer, 8));
@@ -222,19 +205,13 @@ public abstract class DF1ResponseMessage implements Message {
     readBuffer.closeContext("DF1ResponseMessage");
     // Create the instance
     DF1ResponseMessage _dF1ResponseMessage =
-        builder.build(destinationAddress, sourceAddress, status, transactionCounter, payloadLength);
-    _dF1ResponseMessage.reservedField0 = reservedField0;
-    _dF1ResponseMessage.reservedField1 = reservedField1;
+        builder.build(destinationAddress, sourceAddress, status, transactionCounter);
     return _dF1ResponseMessage;
   }
 
   public interface DF1ResponseMessageBuilder {
     DF1ResponseMessage build(
-        short destinationAddress,
-        short sourceAddress,
-        short status,
-        int transactionCounter,
-        Integer payloadLength);
+        short destinationAddress, short sourceAddress, short status, int transactionCounter);
   }
 
   @Override
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockAmsNetId.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockAmsNetId.java
index e34c4dd6cb..a7bf1e3044 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockAmsNetId.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockAmsNetId.java
@@ -124,7 +124,6 @@ public class AdsDiscoveryBlockAmsNetId extends AdsDiscoveryBlock implements Mess
     private final AmsNetId amsNetId;
 
     public AdsDiscoveryBlockAmsNetIdBuilderImpl(AmsNetId amsNetId) {
-
       this.amsNetId = amsNetId;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockFingerprint.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockFingerprint.java
index 585986556c..19ce41d129 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockFingerprint.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockFingerprint.java
@@ -114,7 +114,6 @@ public class AdsDiscoveryBlockFingerprint extends AdsDiscoveryBlock implements M
     private final byte[] data;
 
     public AdsDiscoveryBlockFingerprintBuilderImpl(byte[] data) {
-
       this.data = data;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockHostName.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockHostName.java
index 62e76d9ddb..9c2c980441 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockHostName.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockHostName.java
@@ -105,7 +105,6 @@ public class AdsDiscoveryBlockHostName extends AdsDiscoveryBlock implements Mess
     private final AmsString hostName;
 
     public AdsDiscoveryBlockHostNameBuilderImpl(AmsString hostName) {
-
       this.hostName = hostName;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockOsData.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockOsData.java
index 04eb9c351a..77a07aba38 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockOsData.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockOsData.java
@@ -114,7 +114,6 @@ public class AdsDiscoveryBlockOsData extends AdsDiscoveryBlock implements Messag
     private final byte[] osData;
 
     public AdsDiscoveryBlockOsDataBuilderImpl(byte[] osData) {
-
       this.osData = osData;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockPassword.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockPassword.java
index 07a7381bec..13c7985b80 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockPassword.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockPassword.java
@@ -105,7 +105,6 @@ public class AdsDiscoveryBlockPassword extends AdsDiscoveryBlock implements Mess
     private final AmsString password;
 
     public AdsDiscoveryBlockPasswordBuilderImpl(AmsString password) {
-
       this.password = password;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockRouteName.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockRouteName.java
index e7dfa2975d..0c21c5e3cb 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockRouteName.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockRouteName.java
@@ -105,7 +105,6 @@ public class AdsDiscoveryBlockRouteName extends AdsDiscoveryBlock implements Mes
     private final AmsString routeName;
 
     public AdsDiscoveryBlockRouteNameBuilderImpl(AmsString routeName) {
-
       this.routeName = routeName;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockStatus.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockStatus.java
index c627c417c7..65d0bab01c 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockStatus.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockStatus.java
@@ -128,7 +128,6 @@ public class AdsDiscoveryBlockStatus extends AdsDiscoveryBlock implements Messag
     private final Status status;
 
     public AdsDiscoveryBlockStatusBuilderImpl(Status status) {
-
       this.status = status;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockUserName.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockUserName.java
index 484b670306..4bda99ddcc 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockUserName.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockUserName.java
@@ -105,7 +105,6 @@ public class AdsDiscoveryBlockUserName extends AdsDiscoveryBlock implements Mess
     private final AmsString userName;
 
     public AdsDiscoveryBlockUserNameBuilderImpl(AmsString userName) {
-
       this.userName = userName;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockVersion.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockVersion.java
index 9f63757c86..bdd94f5c81 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockVersion.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AdsDiscoveryBlockVersion.java
@@ -114,7 +114,6 @@ public class AdsDiscoveryBlockVersion extends AdsDiscoveryBlock implements Messa
     private final byte[] versionData;
 
     public AdsDiscoveryBlockVersionBuilderImpl(byte[] versionData) {
-
       this.versionData = versionData;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AmsString.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AmsString.java
index d6e3464bfc..76c91cbe2d 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AmsString.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/discovery/readwrite/AmsString.java
@@ -39,8 +39,6 @@ public class AmsString implements Message {
 
   // Properties.
   protected final String text;
-  // Reserved Fields
-  private Short reservedField0;
 
   public AmsString(String text) {
     super();
@@ -69,10 +67,7 @@ public class AmsString implements Message {
         WithOption.WithEncoding("UTF-8"));
 
     // Reserved Field (reserved)
-    writeReservedField(
-        "reserved",
-        reservedField0 != null ? reservedField0 : (short) 0x00,
-        writeUnsignedShort(writeBuffer, 8));
+    writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
 
     writeBuffer.popContext("AmsString");
   }
@@ -125,7 +120,6 @@ public class AmsString implements Message {
     // Create the instance
     AmsString _amsString;
     _amsString = new AmsString(text);
-    _amsString.reservedField0 = reservedField0;
     return _amsString;
   }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationRequest.java
index 87827b201a..ce4a992d4e 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationRequest.java
@@ -54,9 +54,6 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
   protected final AdsTransMode transmissionMode;
   protected final long maxDelayInMs;
   protected final long cycleTimeInMs;
-  // Reserved Fields
-  private BigInteger reservedField0;
-  private BigInteger reservedField1;
 
   public AdsAddDeviceNotificationRequest(
       AmsNetId targetAmsNetId,
@@ -135,15 +132,11 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
 
     // Reserved Field (reserved)
     writeReservedField(
-        "reserved",
-        reservedField0 != null ? reservedField0 : BigInteger.valueOf(0x0000),
-        writeUnsignedBigInteger(writeBuffer, 64));
+        "reserved", BigInteger.valueOf(0x0000), writeUnsignedBigInteger(writeBuffer, 64));
 
     // Reserved Field (reserved)
     writeReservedField(
-        "reserved",
-        reservedField1 != null ? reservedField1 : BigInteger.valueOf(0x0000),
-        writeUnsignedBigInteger(writeBuffer, 64));
+        "reserved", BigInteger.valueOf(0x0000), writeUnsignedBigInteger(writeBuffer, 64));
 
     writeBuffer.popContext("AdsAddDeviceNotificationRequest");
   }
@@ -220,14 +213,7 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
     readBuffer.closeContext("AdsAddDeviceNotificationRequest");
     // Create the instance
     return new AdsAddDeviceNotificationRequestBuilderImpl(
-        indexGroup,
-        indexOffset,
-        length,
-        transmissionMode,
-        maxDelayInMs,
-        cycleTimeInMs,
-        reservedField0,
-        reservedField1);
+        indexGroup, indexOffset, length, transmissionMode, maxDelayInMs, cycleTimeInMs);
   }
 
   public static class AdsAddDeviceNotificationRequestBuilderImpl
@@ -238,8 +224,6 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
     private final AdsTransMode transmissionMode;
     private final long maxDelayInMs;
     private final long cycleTimeInMs;
-    private final BigInteger reservedField0;
-    private final BigInteger reservedField1;
 
     public AdsAddDeviceNotificationRequestBuilderImpl(
         long indexGroup,
@@ -247,17 +231,13 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
         long length,
         AdsTransMode transmissionMode,
         long maxDelayInMs,
-        long cycleTimeInMs,
-        BigInteger reservedField0,
-        BigInteger reservedField1) {
+        long cycleTimeInMs) {
       this.indexGroup = indexGroup;
       this.indexOffset = indexOffset;
       this.length = length;
       this.transmissionMode = transmissionMode;
       this.maxDelayInMs = maxDelayInMs;
       this.cycleTimeInMs = cycleTimeInMs;
-      this.reservedField0 = reservedField0;
-      this.reservedField1 = reservedField1;
     }
 
     public AdsAddDeviceNotificationRequest build(
@@ -281,8 +261,6 @@ public class AdsAddDeviceNotificationRequest extends AmsPacket implements Messag
               transmissionMode,
               maxDelayInMs,
               cycleTimeInMs);
-      adsAddDeviceNotificationRequest.reservedField0 = reservedField0;
-      adsAddDeviceNotificationRequest.reservedField1 = reservedField1;
       return adsAddDeviceNotificationRequest;
     }
   }
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationResponse.java
index 44f51e55e5..d0429544aa 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsAddDeviceNotificationResponse.java
@@ -139,7 +139,6 @@ public class AdsAddDeviceNotificationResponse extends AmsPacket implements Messa
     private final long notificationHandle;
 
     public AdsAddDeviceNotificationResponseBuilderImpl(ReturnCode result, long notificationHandle) {
-
       this.result = result;
       this.notificationHandle = notificationHandle;
     }
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationRequest.java
index 0af3618b4e..ced2a34049 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationRequest.java
@@ -113,7 +113,6 @@ public class AdsDeleteDeviceNotificationRequest extends AmsPacket implements Mes
     private final long notificationHandle;
 
     public AdsDeleteDeviceNotificationRequestBuilderImpl(long notificationHandle) {
-
       this.notificationHandle = notificationHandle;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationResponse.java
index 8d99630c7d..d9a3b3c704 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeleteDeviceNotificationResponse.java
@@ -122,7 +122,6 @@ public class AdsDeleteDeviceNotificationResponse extends AmsPacket implements Me
     private final ReturnCode result;
 
     public AdsDeleteDeviceNotificationResponseBuilderImpl(ReturnCode result) {
-
       this.result = result;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeviceNotificationRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeviceNotificationRequest.java
index d04e83f834..8e64342845 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeviceNotificationRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDeviceNotificationRequest.java
@@ -156,7 +156,6 @@ public class AdsDeviceNotificationRequest extends AmsPacket implements Message {
 
     public AdsDeviceNotificationRequestBuilderImpl(
         long length, long stamps, List<AdsStampHeader> adsStampHeaders) {
-
       this.length = length;
       this.stamps = stamps;
       this.adsStampHeaders = adsStampHeaders;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemRead.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemRead.java
index a6a8ea688a..b021cb0830 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemRead.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemRead.java
@@ -133,7 +133,6 @@ public class AdsMultiRequestItemRead extends AdsMultiRequestItem implements Mess
 
     public AdsMultiRequestItemReadBuilderImpl(
         long itemIndexGroup, long itemIndexOffset, long itemReadLength) {
-
       this.itemIndexGroup = itemIndexGroup;
       this.itemIndexOffset = itemIndexOffset;
       this.itemReadLength = itemReadLength;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemReadWrite.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemReadWrite.java
index db2b94982f..992de98625 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemReadWrite.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemReadWrite.java
@@ -150,7 +150,6 @@ public class AdsMultiRequestItemReadWrite extends AdsMultiRequestItem implements
 
     public AdsMultiRequestItemReadWriteBuilderImpl(
         long itemIndexGroup, long itemIndexOffset, long itemReadLength, long itemWriteLength) {
-
       this.itemIndexGroup = itemIndexGroup;
       this.itemIndexOffset = itemIndexOffset;
       this.itemReadLength = itemReadLength;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemWrite.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemWrite.java
index 09a97e6b44..36fac24adc 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemWrite.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsMultiRequestItemWrite.java
@@ -134,7 +134,6 @@ public class AdsMultiRequestItemWrite extends AdsMultiRequestItem implements Mes
 
     public AdsMultiRequestItemWriteBuilderImpl(
         long itemIndexGroup, long itemIndexOffset, long itemWriteLength) {
-
       this.itemIndexGroup = itemIndexGroup;
       this.itemIndexOffset = itemIndexOffset;
       this.itemWriteLength = itemWriteLength;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadDeviceInfoResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadDeviceInfoResponse.java
index 150879f563..87200ffeeb 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadDeviceInfoResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadDeviceInfoResponse.java
@@ -189,7 +189,6 @@ public class AdsReadDeviceInfoResponse extends AmsPacket implements Message {
 
     public AdsReadDeviceInfoResponseBuilderImpl(
         ReturnCode result, short majorVersion, short minorVersion, int version, byte[] device) {
-
       this.result = result;
       this.majorVersion = majorVersion;
       this.minorVersion = minorVersion;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadRequest.java
index 30a0c94cb8..da4fa9263f 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadRequest.java
@@ -143,7 +143,6 @@ public class AdsReadRequest extends AmsPacket implements Message {
     private final long length;
 
     public AdsReadRequestBuilderImpl(long indexGroup, long indexOffset, long length) {
-
       this.indexGroup = indexGroup;
       this.indexOffset = indexOffset;
       this.length = length;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadResponse.java
index afc71825b7..d8724af1f9 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadResponse.java
@@ -149,7 +149,6 @@ public class AdsReadResponse extends AmsPacket implements Message {
     private final byte[] data;
 
     public AdsReadResponseBuilderImpl(ReturnCode result, byte[] data) {
-
       this.result = result;
       this.data = data;
     }
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadStateResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadStateResponse.java
index 8f3d9c573f..1b2beec369 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadStateResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadStateResponse.java
@@ -153,7 +153,6 @@ public class AdsReadStateResponse extends AmsPacket implements Message {
     private final int deviceState;
 
     public AdsReadStateResponseBuilderImpl(ReturnCode result, int adsState, int deviceState) {
-
       this.result = result;
       this.adsState = adsState;
       this.deviceState = deviceState;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteRequest.java
index 5d364fef0a..dc0b3f7409 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteRequest.java
@@ -211,7 +211,6 @@ public class AdsReadWriteRequest extends AmsPacket implements Message {
         long readLength,
         List<AdsMultiRequestItem> items,
         byte[] data) {
-
       this.indexGroup = indexGroup;
       this.indexOffset = indexOffset;
       this.readLength = readLength;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteResponse.java
index 5ee93de0fd..874621bba8 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsReadWriteResponse.java
@@ -149,7 +149,6 @@ public class AdsReadWriteResponse extends AmsPacket implements Message {
     private final byte[] data;
 
     public AdsReadWriteResponseBuilderImpl(ReturnCode result, byte[] data) {
-
       this.result = result;
       this.data = data;
     }
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsSymbolTableEntry.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsSymbolTableEntry.java
index 5e300ce7dd..325a3b1542 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsSymbolTableEntry.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsSymbolTableEntry.java
@@ -65,9 +65,6 @@ public class AdsSymbolTableEntry implements Message {
   protected final String dataTypeName;
   protected final String comment;
   protected final byte[] rest;
-  // Reserved Fields
-  private Byte reservedField0;
-  private Integer reservedField1;
 
   public AdsSymbolTableEntry(
       long entryLength,
@@ -316,7 +313,7 @@ public class AdsSymbolTableEntry implements Message {
     // Reserved Field (reserved)
     writeReservedField(
         "reserved",
-        reservedField0 != null ? reservedField0 : (byte) 0x00,
+        (byte) 0x00,
         writeUnsignedByte(writeBuffer, 3),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
@@ -358,7 +355,7 @@ public class AdsSymbolTableEntry implements Message {
     // Reserved Field (reserved)
     writeReservedField(
         "reserved",
-        reservedField1 != null ? reservedField1 : (int) 0x0000,
+        (int) 0x0000,
         writeUnsignedInt(writeBuffer, 16),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
@@ -770,8 +767,6 @@ public class AdsSymbolTableEntry implements Message {
             dataTypeName,
             comment,
             rest);
-    _adsSymbolTableEntry.reservedField0 = reservedField0;
-    _adsSymbolTableEntry.reservedField1 = reservedField1;
     return _adsSymbolTableEntry;
   }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlRequest.java
index f29765e555..7d4deb08fc 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlRequest.java
@@ -155,7 +155,6 @@ public class AdsWriteControlRequest extends AmsPacket implements Message {
     private final byte[] data;
 
     public AdsWriteControlRequestBuilderImpl(int adsState, int deviceState, byte[] data) {
-
       this.adsState = adsState;
       this.deviceState = deviceState;
       this.data = data;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlResponse.java
index 1d14d4dfb2..833b667954 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteControlResponse.java
@@ -121,7 +121,6 @@ public class AdsWriteControlResponse extends AmsPacket implements Message {
     private final ReturnCode result;
 
     public AdsWriteControlResponseBuilderImpl(ReturnCode result) {
-
       this.result = result;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteRequest.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteRequest.java
index 259d3b8336..0be5166091 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteRequest.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteRequest.java
@@ -155,7 +155,6 @@ public class AdsWriteRequest extends AmsPacket implements Message {
     private final byte[] data;
 
     public AdsWriteRequestBuilderImpl(long indexGroup, long indexOffset, byte[] data) {
-
       this.indexGroup = indexGroup;
       this.indexOffset = indexOffset;
       this.data = data;
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteResponse.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteResponse.java
index 75486fd115..97288814bd 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteResponse.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsWriteResponse.java
@@ -121,7 +121,6 @@ public class AdsWriteResponse extends AmsPacket implements Message {
     private final ReturnCode result;
 
     public AdsWriteResponseBuilderImpl(ReturnCode result) {
-
       this.result = result;
     }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsPacket.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsPacket.java
index 279195ba66..2f3578ead5 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsPacket.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsPacket.java
@@ -59,8 +59,6 @@ public abstract class AmsPacket implements Message {
   protected final int sourceAmsPort;
   protected final long errorCode;
   protected final long invokeId;
-  // Reserved Fields
-  private Byte reservedField0;
 
   public AmsPacket(
       AmsNetId targetAmsNetId,
@@ -190,10 +188,7 @@ public abstract class AmsPacket implements Message {
     writeConstField("broadcast", BROADCAST, writeBoolean(writeBuffer));
 
     // Reserved Field (reserved)
-    writeReservedField(
-        "reserved",
-        reservedField0 != null ? reservedField0 : (byte) 0x0,
-        writeSignedByte(writeBuffer, 7));
+    writeReservedField("reserved", (byte) 0x0, writeSignedByte(writeBuffer, 7));
 
     // Implicit Field (length) (Used for parsing, but its value is not stored as it's implicitly
     // given by the objects content)
@@ -449,7 +444,6 @@ public abstract class AmsPacket implements Message {
     AmsPacket _amsPacket =
         builder.build(
             targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, errorCode, invokeId);
-    _amsPacket.reservedField0 = reservedField0;
     return _amsPacket;
   }
 
diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsTCPPacket.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsTCPPacket.java
index e16963a1e9..ae65ab5235 100644
--- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsTCPPacket.java
+++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AmsTCPPacket.java
@@ -39,8 +39,6 @@ public class AmsTCPPacket implements Message {
 
   // Properties.
   protected final AmsPacket userdata;
-  // Reserved Fields
-  private Integer reservedField0;
 
   public AmsTCPPacket(AmsPacket userdata) {
     super();
@@ -59,7 +57,7 @@ public class AmsTCPPacket implements Message {
     // Reserved Field (reserved)
     writeReservedField(
         "reserved",
-        reservedField0 != null ? reservedField0 : (int) 0x0000,
+        (int) 0x0000,
         writeUnsignedInt(writeBuffer, 16),
         WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN));
 
@@ -139,7 +137,6 @@ public class AmsTCPPacket implements Message {
     // Create the instance
     AmsTCPPacket _amsTCPPacket;
     _amsTCPPacket = new AmsTCPPacket(userdata);
-    _amsTCPPacket.reservedField0 = reservedField0;
     return _amsTCPPacket;
   }
 
diff --git a/plc4j/drivers/bacnet/pom.xml b/plc4j/drivers/bacnet/pom.xml
index f02ea6d711..cf988f4fd7 100644
--- a/plc4j/drivers/bacnet/pom.xml
+++ b/plc4j/drivers/bacnet/pom.xml
@@ -47,6 +47,11 @@
               <languageName>java</languageName>
               <outputFlavor>read-write</outputFlavor>
               <outputDir>src/main/generated</outputDir>
+              <options>
+                <generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
+                <!-- We want properties that contain the values of reserved fields, if the value differs from the expected one -->
+                <generate-properties-for-reserved-fields>true</generate-properties-for-reserved-fields>
+              </options>
             </configuration>
           </execution>
         </executions>
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
index 05eb05abe8..f73ddf10aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/APDUUnknown.java
@@ -124,7 +124,6 @@ public class APDUUnknown extends APDU implements Message {
     private final Integer apduLength;
 
     public APDUUnknownBuilderImpl(byte unknownTypeRest, byte[] unknownBytes, Integer apduLength) {
-
       this.unknownTypeRest = unknownTypeRest;
       this.unknownBytes = unknownBytes;
       this.apduLength = apduLength;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBitString.java
index 25329c1b0d..cda5a9f0df 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBitString.java
@@ -106,7 +106,6 @@ public class BACnetApplicationTagBitString extends BACnetApplicationTag implemen
     private final BACnetTagPayloadBitString payload;
 
     public BACnetApplicationTagBitStringBuilderImpl(BACnetTagPayloadBitString payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBoolean.java
index 5edff5762a..6e8cbe1289 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagBoolean.java
@@ -117,7 +117,6 @@ public class BACnetApplicationTagBoolean extends BACnetApplicationTag implements
     private final BACnetTagPayloadBoolean payload;
 
     public BACnetApplicationTagBooleanBuilderImpl(BACnetTagPayloadBoolean payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagCharacterString.java
index 780888f2e7..0d1d6fd9dd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagCharacterString.java
@@ -118,7 +118,6 @@ public class BACnetApplicationTagCharacterString extends BACnetApplicationTag im
     private final BACnetTagPayloadCharacterString payload;
 
     public BACnetApplicationTagCharacterStringBuilderImpl(BACnetTagPayloadCharacterString payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDate.java
index 582d81cbc3..79a9df5c0a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDate.java
@@ -103,7 +103,6 @@ public class BACnetApplicationTagDate extends BACnetApplicationTag implements Me
     private final BACnetTagPayloadDate payload;
 
     public BACnetApplicationTagDateBuilderImpl(BACnetTagPayloadDate payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDouble.java
index 46d225cf58..8ad49d773b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagDouble.java
@@ -114,7 +114,6 @@ public class BACnetApplicationTagDouble extends BACnetApplicationTag implements
     private final BACnetTagPayloadDouble payload;
 
     public BACnetApplicationTagDoubleBuilderImpl(BACnetTagPayloadDouble payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagEnumerated.java
index f6d62fdeb9..3db2426e89 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagEnumerated.java
@@ -118,7 +118,6 @@ public class BACnetApplicationTagEnumerated extends BACnetApplicationTag impleme
     private final BACnetTagPayloadEnumerated payload;
 
     public BACnetApplicationTagEnumeratedBuilderImpl(BACnetTagPayloadEnumerated payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java
index ed2aad33de..52c64c65d8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java
@@ -129,7 +129,6 @@ public class BACnetApplicationTagObjectIdentifier extends BACnetApplicationTag i
 
     public BACnetApplicationTagObjectIdentifierBuilderImpl(
         BACnetTagPayloadObjectIdentifier payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagOctetString.java
index 4c87563c1d..763e845d30 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagOctetString.java
@@ -107,7 +107,6 @@ public class BACnetApplicationTagOctetString extends BACnetApplicationTag implem
     private final BACnetTagPayloadOctetString payload;
 
     public BACnetApplicationTagOctetStringBuilderImpl(BACnetTagPayloadOctetString payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagReal.java
index 421a7ad6fe..fd9a69798b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagReal.java
@@ -114,7 +114,6 @@ public class BACnetApplicationTagReal extends BACnetApplicationTag implements Me
     private final BACnetTagPayloadReal payload;
 
     public BACnetApplicationTagRealBuilderImpl(BACnetTagPayloadReal payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagSignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagSignedInteger.java
index c7705dc09a..0e87f62b5c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagSignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagSignedInteger.java
@@ -122,7 +122,6 @@ public class BACnetApplicationTagSignedInteger extends BACnetApplicationTag impl
     private final BACnetTagPayloadSignedInteger payload;
 
     public BACnetApplicationTagSignedIntegerBuilderImpl(BACnetTagPayloadSignedInteger payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagTime.java
index 0d49a28395..5f9b74193f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagTime.java
@@ -103,7 +103,6 @@ public class BACnetApplicationTagTime extends BACnetApplicationTag implements Me
     private final BACnetTagPayloadTime payload;
 
     public BACnetApplicationTagTimeBuilderImpl(BACnetTagPayloadTime payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagUnsignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagUnsignedInteger.java
index 54b432b0b6..c39b32c648 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagUnsignedInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagUnsignedInteger.java
@@ -122,7 +122,6 @@ public class BACnetApplicationTagUnsignedInteger extends BACnetApplicationTag im
     private final BACnetTagPayloadUnsignedInteger payload;
 
     public BACnetApplicationTagUnsignedIntegerBuilderImpl(BACnetTagPayloadUnsignedInteger payload) {
-
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDate.java
index f8b77922cd..25b3794865 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDate.java
@@ -107,7 +107,6 @@ public class BACnetCalendarEntryDate extends BACnetCalendarEntry implements Mess
     private final BACnetContextTagDate dateValue;
 
     public BACnetCalendarEntryDateBuilderImpl(BACnetContextTagDate dateValue) {
-
       this.dateValue = dateValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDateRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDateRange.java
index f97949020a..a80368abb1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDateRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryDateRange.java
@@ -104,7 +104,6 @@ public class BACnetCalendarEntryDateRange extends BACnetCalendarEntry implements
     private final BACnetDateRangeEnclosed dateRange;
 
     public BACnetCalendarEntryDateRangeBuilderImpl(BACnetDateRangeEnclosed dateRange) {
-
       this.dateRange = dateRange;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryWeekNDay.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryWeekNDay.java
index 209235553c..b5722c4de7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryWeekNDay.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetCalendarEntryWeekNDay.java
@@ -107,7 +107,6 @@ public class BACnetCalendarEntryWeekNDay extends BACnetCalendarEntry implements
     private final BACnetWeekNDayTagged weekNDay;
 
     public BACnetCalendarEntryWeekNDayBuilderImpl(BACnetWeekNDayTagged weekNDay) {
-
       this.weekNDay = weekNDay;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBitString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBitString.java
index d839cc4771..bf1ddc2ef6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBitString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBitString.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueBitString extends BACnetChannelValue implements M
     private final BACnetApplicationTagBitString bitStringValue;
 
     public BACnetChannelValueBitStringBuilderImpl(BACnetApplicationTagBitString bitStringValue) {
-
       this.bitStringValue = bitStringValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBoolean.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBoolean.java
index 544e450d28..cca4b56bd7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBoolean.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueBoolean.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueBoolean extends BACnetChannelValue implements Mes
     private final BACnetApplicationTagBoolean booleanValue;
 
     public BACnetChannelValueBooleanBuilderImpl(BACnetApplicationTagBoolean booleanValue) {
-
       this.booleanValue = booleanValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueCharacterString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueCharacterString.java
index 4587d87249..3c1b7c4234 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueCharacterString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueCharacterString.java
@@ -109,7 +109,6 @@ public class BACnetChannelValueCharacterString extends BACnetChannelValue implem
 
     public BACnetChannelValueCharacterStringBuilderImpl(
         BACnetApplicationTagCharacterString characterStringValue) {
-
       this.characterStringValue = characterStringValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDate.java
index 267f72e4d8..1988e25827 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDate.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueDate extends BACnetChannelValue implements Messag
     private final BACnetApplicationTagDate dateValue;
 
     public BACnetChannelValueDateBuilderImpl(BACnetApplicationTagDate dateValue) {
-
       this.dateValue = dateValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDouble.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDouble.java
index e105ed06b7..216b4ecacf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDouble.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueDouble.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueDouble extends BACnetChannelValue implements Mess
     private final BACnetApplicationTagDouble doubleValue;
 
     public BACnetChannelValueDoubleBuilderImpl(BACnetApplicationTagDouble doubleValue) {
-
       this.doubleValue = doubleValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueEnumerated.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueEnumerated.java
index 744ee66924..4d6a67ed91 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueEnumerated.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueEnumerated.java
@@ -106,7 +106,6 @@ public class BACnetChannelValueEnumerated extends BACnetChannelValue implements
     private final BACnetApplicationTagEnumerated enumeratedValue;
 
     public BACnetChannelValueEnumeratedBuilderImpl(BACnetApplicationTagEnumerated enumeratedValue) {
-
       this.enumeratedValue = enumeratedValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueInteger.java
index 37aff34a64..546c3ca4a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueInteger.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueInteger.java
@@ -107,7 +107,6 @@ public class BACnetChannelValueInteger extends BACnetChannelValue implements Mes
     private final BACnetApplicationTagSignedInteger integerValue;
 
     public BACnetChannelValueIntegerBuilderImpl(BACnetApplicationTagSignedInteger integerValue) {
-
       this.integerValue = integerValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueLightingCommand.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueLightingCommand.java
index afdbd46b9b..12b9e764fb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueLightingCommand.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueLightingCommand.java
@@ -107,7 +107,6 @@ public class BACnetChannelValueLightingCommand extends BACnetChannelValue implem
 
     public BACnetChannelValueLightingCommandBuilderImpl(
         BACnetLightingCommandEnclosed ligthingCommandValue) {
-
       this.ligthingCommandValue = ligthingCommandValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueNull.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueNull.java
index fd42be9e93..2d9a54cedf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueNull.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueNull.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueNull extends BACnetChannelValue implements Messag
     private final BACnetApplicationTagNull nullValue;
 
     public BACnetChannelValueNullBuilderImpl(BACnetApplicationTagNull nullValue) {
-
       this.nullValue = nullValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueObjectidentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueObjectidentifier.java
index 50c833d8d1..3599070e62 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueObjectidentifier.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueObjectidentifier.java
@@ -111,7 +111,6 @@ public class BACnetChannelValueObjectidentifier extends BACnetChannelValue imple
 
     public BACnetChannelValueObjectidentifierBuilderImpl(
         BACnetApplicationTagObjectIdentifier objectidentifierValue) {
-
       this.objectidentifierValue = objectidentifierValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueOctetString.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueOctetString.java
index dfa0c0471c..df5758f47b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueOctetString.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueOctetString.java
@@ -108,7 +108,6 @@ public class BACnetChannelValueOctetString extends BACnetChannelValue implements
 
     public BACnetChannelValueOctetStringBuilderImpl(
         BACnetApplicationTagOctetString octetStringValue) {
-
       this.octetStringValue = octetStringValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueReal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueReal.java
index 1b35908d8c..8b0a32ac98 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueReal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueReal.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueReal extends BACnetChannelValue implements Messag
     private final BACnetApplicationTagReal realValue;
 
     public BACnetChannelValueRealBuilderImpl(BACnetApplicationTagReal realValue) {
-
       this.realValue = realValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueTime.java
index 86365b999f..aa24cee810 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueTime.java
@@ -105,7 +105,6 @@ public class BACnetChannelValueTime extends BACnetChannelValue implements Messag
     private final BACnetApplicationTagTime timeValue;
 
     public BACnetChannelValueTimeBuilderImpl(BACnetApplicationTagTime timeValue) {
-
       this.timeValue = timeValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueUnsigned.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueUnsigned.java
index aabf18cd74..a2d0d8af3f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueUnsigned.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetChannelValueUnsigned.java
@@ -108,7 +108,6 @@ public class BACnetChannelValueUnsigned extends BACnetChannelValue implements Me
 
     public BACnetChannelValueUnsignedBuilderImpl(
         BACnetApplicationTagUnsignedInteger unsignedValue) {
-
       this.unsignedValue = unsignedValue;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVNone.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVNone.java
index 255e37d2d1..848c576e87 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVNone.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVNone.java
@@ -106,7 +106,6 @@ public class BACnetClientCOVNone extends BACnetClientCOV implements Message {
     private final BACnetApplicationTagNull defaultIncrement;
 
     public BACnetClientCOVNoneBuilderImpl(BACnetApplicationTagNull defaultIncrement) {
-
       this.defaultIncrement = defaultIncrement;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVObject.java
index af11881e34..d66e5eac26 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetClientCOVObject.java
@@ -105,7 +105,6 @@ public class BACnetClientCOVObject extends BACnetClientCOV implements Message {
     private final BACnetApplicationTagReal realIncrement;
 
     public BACnetClientCOVObjectBuilderImpl(BACnetApplicationTagReal realIncrement) {
-
       this.realIncrement = realIncrement;
     }
 
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
index 6d007eeb70..2288cac36f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequest.java
@@ -225,7 +225,7 @@ public abstract class BACnetConfirmedServiceRequest implements Message {
       builder =
           BACnetConfirmedServiceRequestReadPropertyMultiple
               .staticParseBACnetConfirmedServiceRequestBuilder(
-                  readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+                  readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (EvaluationHelper.equals(serviceChoice, BACnetConfirmedServiceChoice.READ_RANGE)) {
       builder =
           BACnetConfirmedServiceRequestReadRange.staticParseBACnetConfirmedServiceRequestBuilder(
@@ -240,7 +240,7 @@ public abstract class BACnetConfirmedServiceRequest implements Message {
       builder =
           BACnetConfirmedServiceRequestWritePropertyMultiple
               .staticParseBACnetConfirmedServiceRequestBuilder(
-                  readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+                  readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (EvaluationHelper.equals(
         serviceChoice, BACnetConfirmedServiceChoice.DEVICE_COMMUNICATION_CONTROL)) {
       builder =
@@ -268,7 +268,7 @@ public abstract class BACnetConfirmedServiceRequest implements Message {
     } else if (EvaluationHelper.equals(serviceChoice, BACnetConfirmedServiceChoice.VT_CLOSE)) {
       builder =
           BACnetConfirmedServiceRequestVTClose.staticParseBACnetConfirmedServiceRequestBuilder(
-              readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+              readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (EvaluationHelper.equals(serviceChoice, BACnetConfirmedServiceChoice.VT_DATA)) {
       builder =
           BACnetConfirmedServiceRequestVTData.staticParseBACnetConfirmedServiceRequestBuilder(
@@ -276,21 +276,21 @@ public abstract class BACnetConfirmedServiceRequest implements Message {
     } else if (EvaluationHelper.equals(serviceChoice, BACnetConfirmedServiceChoice.AUTHENTICATE)) {
       builder =
           BACnetConfirmedServiceRequestAuthenticate.staticParseBACnetConfirmedServiceRequestBuilder(
-              readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+              readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (EvaluationHelper.equals(serviceChoice, BACnetConfirmedServiceChoice.REQUEST_KEY)) {
       builder =
           BACnetConfirmedServiceRequestRequestKey.staticParseBACnetConfirmedServiceRequestBuilder(
-              readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+              readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (EvaluationHelper.equals(
         serviceChoice, BACnetConfirmedServiceChoice.READ_PROPERTY_CONDITIONAL)) {
       builder =
           BACnetConfirmedServiceRequestReadPropertyConditional
               .staticParseBACnetConfirmedServiceRequestBuilder(
-                  readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+                  readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     } else if (true) {
       builder =
           BACnetConfirmedServiceRequestUnknown.staticParseBACnetConfirmedServiceRequestBuilder(
-              readBuffer, serviceRequestLength, serviceRequestPayloadLength);
+              readBuffer, serviceRequestPayloadLength, serviceRequestLength);
     }
     if (builder == null) {
       throw new ParseException(
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
index 8830629956..5d2635c85c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAcknowledgeAlarm.java
@@ -261,7 +261,6 @@ public class BACnetConfirmedServiceRequestAcknowledgeAlarm extends BACnetConfirm
         BACnetContextTagCharacterString acknowledgmentSource,
         BACnetTimeStampEnclosed timeOfAcknowledgment,
         Long serviceRequestLength) {
-
       this.acknowledgingProcessIdentifier = acknowledgingProcessIdentifier;
       this.eventObjectIdentifier = eventObjectIdentifier;
       this.eventStateAcknowledged = eventStateAcknowledged;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
index 5ca96d371a..d485f7a9e1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAddListElement.java
@@ -211,7 +211,6 @@ public class BACnetConfirmedServiceRequestAddListElement extends BACnetConfirmed
         BACnetContextTagUnsignedInteger arrayIndex,
         BACnetConstructedData listOfElements,
         Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
index 84c5026e47..2cf92c44eb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFile.java
@@ -145,7 +145,6 @@ public class BACnetConfirmedServiceRequestAtomicReadFile extends BACnetConfirmed
         BACnetApplicationTagObjectIdentifier fileIdentifier,
         BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord accessMethod,
         Long serviceRequestLength) {
-
       this.fileIdentifier = fileIdentifier;
       this.accessMethod = accessMethod;
       this.serviceRequestLength = serviceRequestLength;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileRecord.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileRecord.java
index 57ac5a4761..c335eb7469 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileRecord.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileRecord.java
@@ -141,7 +141,6 @@ public class BACnetConfirmedServiceRequestAtomicReadFileRecord
     public BACnetConfirmedServiceRequestAtomicReadFileRecordBuilderImpl(
         BACnetApplicationTagSignedInteger fileStartRecord,
         BACnetApplicationTagUnsignedInteger requestRecordCount) {
-
       this.fileStartRecord = fileStartRecord;
       this.requestRecordCount = requestRecordCount;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileStream.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileStream.java
index 44eb6e3ecf..7ba1b1af93 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileStream.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicReadFileStream.java
@@ -141,7 +141,6 @@ public class BACnetConfirmedServiceRequestAtomicReadFileStream
     public BACnetConfirmedServiceRequestAtomicReadFileStreamBuilderImpl(
         BACnetApplicationTagSignedInteger fileStartPosition,
         BACnetApplicationTagUnsignedInteger requestOctetCount) {
-
       this.fileStartPosition = fileStartPosition;
       this.requestOctetCount = requestOctetCount;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
index 973dcdf806..05c4fe9ce4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAtomicWriteFile.java
@@ -221,7 +221,6 @@ public class BACnetConfirmedServiceRequestAtomicWriteFile extends BACnetConfirme
         BACnetApplicationTagOctetString fileData,
         BACnetClosingTag closingTag,
         Long serviceRequestLength) {
-
       this.deviceIdentifier = deviceIdentifier;
       this.openingTag = openingTag;
       this.fileStartPosition = fileStartPosition;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
index 12eee9fefb..92caa3572b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestAuthenticate.java
@@ -47,15 +47,15 @@ public class BACnetConfirmedServiceRequestAuthenticate extends BACnetConfirmedSe
   protected final byte[] bytesOfRemovedService;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestAuthenticate(
-      byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
+      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -96,7 +96,7 @@ public class BACnetConfirmedServiceRequestAuthenticate extends BACnetConfirmedSe
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestAuthenticate");
     PositionAware positionAware = readBuffer;
@@ -110,28 +110,27 @@ public class BACnetConfirmedServiceRequestAuthenticate extends BACnetConfirmedSe
     readBuffer.closeContext("BACnetConfirmedServiceRequestAuthenticate");
     // Create the instance
     return new BACnetConfirmedServiceRequestAuthenticateBuilderImpl(
-        bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestAuthenticateBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestAuthenticateBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
-
+        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestAuthenticate build(Long serviceRequestLength) {
 
       BACnetConfirmedServiceRequestAuthenticate bACnetConfirmedServiceRequestAuthenticate =
           new BACnetConfirmedServiceRequestAuthenticate(
-              bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+              bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestAuthenticate;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
index 86c1b125ea..cdfb10138c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotification.java
@@ -246,7 +246,6 @@ public class BACnetConfirmedServiceRequestConfirmedCOVNotification
         BACnetContextTagUnsignedInteger lifetimeInSeconds,
         BACnetPropertyValues listOfValues,
         Long serviceRequestLength) {
-
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
index d7ac4902dc..031461307f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.java
@@ -236,7 +236,6 @@ public class BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
         BACnetTimeStampEnclosed timestamp,
         ListOfCovNotificationsList listOfCovNotifications,
         Long serviceRequestLength) {
-
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.timeRemaining = timeRemaining;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
index a62190508d..0a4dce271e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedEventNotification.java
@@ -456,7 +456,6 @@ public class BACnetConfirmedServiceRequestConfirmedEventNotification
         BACnetEventStateTagged toState,
         BACnetNotificationParameters eventValues,
         Long serviceRequestLength) {
-
       this.processIdentifier = processIdentifier;
       this.initiatingDeviceIdentifier = initiatingDeviceIdentifier;
       this.eventObjectIdentifier = eventObjectIdentifier;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
index 06b6a6ede2..4ae22aeffc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.java
@@ -180,7 +180,6 @@ public class BACnetConfirmedServiceRequestConfirmedPrivateTransfer
         BACnetContextTagUnsignedInteger serviceNumber,
         BACnetConstructedData serviceParameters,
         Long serviceRequestLength) {
-
       this.vendorId = vendorId;
       this.serviceNumber = serviceNumber;
       this.serviceParameters = serviceParameters;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
index f5922d3645..2f33a46b91 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessage.java
@@ -209,7 +209,6 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessage extends BACnetCon
         BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged messagePriority,
         BACnetContextTagCharacterString message,
         Long serviceRequestLength) {
-
       this.textMessageSourceDevice = textMessageSourceDevice;
       this.messageClass = messageClass;
       this.messagePriority = messagePriority;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
index 6403c10bb7..fbfaad6d32 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.java
@@ -129,7 +129,6 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharac
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacterBuilderImpl(
         BACnetContextTagCharacterString characterValue, Short tagNumber) {
-
       this.characterValue = characterValue;
       this.tagNumber = tagNumber;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
index e901b99b71..6722a5b517 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.java
@@ -125,7 +125,6 @@ public class BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeri
 
     public BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumericBuilderImpl(
         BACnetContextTagUnsignedInteger numericValue, Short tagNumber) {
-
       this.numericValue = numericValue;
       this.tagNumber = tagNumber;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
index 90b1abf854..3d08a39d05 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestCreateObject.java
@@ -153,7 +153,6 @@ public class BACnetConfirmedServiceRequestCreateObject extends BACnetConfirmedSe
         BACnetConfirmedServiceRequestCreateObjectObjectSpecifier objectSpecifier,
         BACnetPropertyValues listOfValues,
         Long serviceRequestLength) {
-
       this.objectSpecifier = objectSpecifier;
       this.listOfValues = listOfValues;
       this.serviceRequestLength = serviceRequestLength;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
index 35e90471a8..3dd0bfd8e6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeleteObject.java
@@ -120,7 +120,6 @@ public class BACnetConfirmedServiceRequestDeleteObject extends BACnetConfirmedSe
 
     public BACnetConfirmedServiceRequestDeleteObjectBuilderImpl(
         BACnetApplicationTagObjectIdentifier objectIdentifier, Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.serviceRequestLength = serviceRequestLength;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
index 8bb7c32575..9f0f816319 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestDeviceCommunicationControl.java
@@ -183,7 +183,6 @@ public class BACnetConfirmedServiceRequestDeviceCommunicationControl
         BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged enableDisable,
         BACnetContextTagCharacterString password,
         Long serviceRequestLength) {
-
       this.timeDuration = timeDuration;
       this.enableDisable = enableDisable;
       this.password = password;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
index 1740a8da56..74fb09bf61 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEnrollmentSummary.java
@@ -279,7 +279,6 @@ public class BACnetConfirmedServiceRequestGetEnrollmentSummary extends BACnetCon
         BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter priorityFilter,
         BACnetContextTagUnsignedInteger notificationClassFilter,
         Long serviceRequestLength) {
-
       this.acknowledgmentFilter = acknowledgmentFilter;
       this.enrollmentFilter = enrollmentFilter;
       this.eventStateFilter = eventStateFilter;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
index 57ef516667..5a4d93ea1b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestGetEventInformation.java
@@ -127,7 +127,6 @@ public class BACnetConfirmedServiceRequestGetEventInformation extends BACnetConf
 
     public BACnetConfirmedServiceRequestGetEventInformationBuilderImpl(
         BACnetContextTagObjectIdentifier lastReceivedObjectIdentifier, Long serviceRequestLength) {
-
       this.lastReceivedObjectIdentifier = lastReceivedObjectIdentifier;
       this.serviceRequestLength = serviceRequestLength;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
index 4263ef1a10..89d5b9f732 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestLifeSafetyOperation.java
@@ -213,7 +213,6 @@ public class BACnetConfirmedServiceRequestLifeSafetyOperation extends BACnetConf
         BACnetLifeSafetyOperationTagged request,
         BACnetContextTagObjectIdentifier objectIdentifier,
         Long serviceRequestLength) {
-
       this.requestingProcessIdentifier = requestingProcessIdentifier;
       this.requestingSource = requestingSource;
       this.request = request;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
index 8177e1f2ba..4f25cb7a36 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadProperty.java
@@ -179,7 +179,6 @@ public class BACnetConfirmedServiceRequestReadProperty extends BACnetConfirmedSe
         BACnetPropertyIdentifierTagged propertyIdentifier,
         BACnetContextTagUnsignedInteger arrayIndex,
         Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
index dd53f4b980..9e59a2ebc3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyConditional.java
@@ -47,15 +47,15 @@ public class BACnetConfirmedServiceRequestReadPropertyConditional
   protected final byte[] bytesOfRemovedService;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestReadPropertyConditional(
-      byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
+      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -96,7 +96,7 @@ public class BACnetConfirmedServiceRequestReadPropertyConditional
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestReadPropertyConditional");
     PositionAware positionAware = readBuffer;
@@ -110,21 +110,20 @@ public class BACnetConfirmedServiceRequestReadPropertyConditional
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadPropertyConditional");
     // Create the instance
     return new BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl(
-        bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadPropertyConditionalBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
-
+        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestReadPropertyConditional build(Long serviceRequestLength) {
@@ -132,7 +131,7 @@ public class BACnetConfirmedServiceRequestReadPropertyConditional
       BACnetConfirmedServiceRequestReadPropertyConditional
           bACnetConfirmedServiceRequestReadPropertyConditional =
               new BACnetConfirmedServiceRequestReadPropertyConditional(
-                  bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+                  bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestReadPropertyConditional;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
index 9a6d372bbe..79442bf50f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadPropertyMultiple.java
@@ -47,17 +47,17 @@ public class BACnetConfirmedServiceRequestReadPropertyMultiple extends BACnetCon
   protected final List<BACnetReadAccessSpecification> data;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestReadPropertyMultiple(
       List<BACnetReadAccessSpecification> data,
-      Long serviceRequestLength,
-      Long serviceRequestPayloadLength) {
+      Long serviceRequestPayloadLength,
+      Long serviceRequestLength) {
     super(serviceRequestLength);
     this.data = data;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetReadAccessSpecification> getData() {
@@ -99,7 +99,7 @@ public class BACnetConfirmedServiceRequestReadPropertyMultiple extends BACnetCon
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestReadPropertyMultiple");
     PositionAware positionAware = readBuffer;
@@ -116,23 +116,22 @@ public class BACnetConfirmedServiceRequestReadPropertyMultiple extends BACnetCon
     readBuffer.closeContext("BACnetConfirmedServiceRequestReadPropertyMultiple");
     // Create the instance
     return new BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl(
-        data, serviceRequestLength, serviceRequestPayloadLength);
+        data, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetReadAccessSpecification> data;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestReadPropertyMultipleBuilderImpl(
         List<BACnetReadAccessSpecification> data,
-        Long serviceRequestLength,
-        Long serviceRequestPayloadLength) {
-
+        Long serviceRequestPayloadLength,
+        Long serviceRequestLength) {
       this.data = data;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestReadPropertyMultiple build(Long serviceRequestLength) {
@@ -140,7 +139,7 @@ public class BACnetConfirmedServiceRequestReadPropertyMultiple extends BACnetCon
       BACnetConfirmedServiceRequestReadPropertyMultiple
           bACnetConfirmedServiceRequestReadPropertyMultiple =
               new BACnetConfirmedServiceRequestReadPropertyMultiple(
-                  data, serviceRequestLength, serviceRequestPayloadLength);
+                  data, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestReadPropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
index 4644d1f2c1..fa5cf4b499 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRange.java
@@ -204,7 +204,6 @@ public class BACnetConfirmedServiceRequestReadRange extends BACnetConfirmedServi
         BACnetContextTagUnsignedInteger propertyArrayIndex,
         BACnetConfirmedServiceRequestReadRangeRange readRange,
         Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.propertyArrayIndex = propertyArrayIndex;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByPosition.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByPosition.java
index 200615b364..cefb48e3c4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByPosition.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByPosition.java
@@ -139,7 +139,6 @@ public class BACnetConfirmedServiceRequestReadRangeRangeByPosition
     public BACnetConfirmedServiceRequestReadRangeRangeByPositionBuilderImpl(
         BACnetApplicationTagUnsignedInteger referenceIndex,
         BACnetApplicationTagSignedInteger count) {
-
       this.referenceIndex = referenceIndex;
       this.count = count;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.java
index bb02afb4f7..160149193b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.java
@@ -142,7 +142,6 @@ public class BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber
     public BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumberBuilderImpl(
         BACnetApplicationTagUnsignedInteger referenceSequenceNumber,
         BACnetApplicationTagSignedInteger count) {
-
       this.referenceSequenceNumber = referenceSequenceNumber;
       this.count = count;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByTime.java
index d3132d3e6b..ec0a27fe6c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReadRangeRangeByTime.java
@@ -134,7 +134,6 @@ public class BACnetConfirmedServiceRequestReadRangeRangeByTime
 
     public BACnetConfirmedServiceRequestReadRangeRangeByTimeBuilderImpl(
         BACnetDateTime referenceTime, BACnetApplicationTagSignedInteger count) {
-
       this.referenceTime = referenceTime;
       this.count = count;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
index 1e7c0e308f..00858fbee5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestReinitializeDevice.java
@@ -162,7 +162,6 @@ public class BACnetConfirmedServiceRequestReinitializeDevice extends BACnetConfi
             reinitializedStateOfDevice,
         BACnetContextTagCharacterString password,
         Long serviceRequestLength) {
-
       this.reinitializedStateOfDevice = reinitializedStateOfDevice;
       this.password = password;
       this.serviceRequestLength = serviceRequestLength;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
index 4a44310151..e2c27775ac 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRemoveListElement.java
@@ -211,7 +211,6 @@ public class BACnetConfirmedServiceRequestRemoveListElement extends BACnetConfir
         BACnetContextTagUnsignedInteger arrayIndex,
         BACnetConstructedData listOfElements,
         Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
index 9b5350830a..0a8eeaa2ff 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestRequestKey.java
@@ -47,15 +47,15 @@ public class BACnetConfirmedServiceRequestRequestKey extends BACnetConfirmedServ
   protected final byte[] bytesOfRemovedService;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestRequestKey(
-      byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
+      byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
     super(serviceRequestLength);
     this.bytesOfRemovedService = bytesOfRemovedService;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getBytesOfRemovedService() {
@@ -96,7 +96,7 @@ public class BACnetConfirmedServiceRequestRequestKey extends BACnetConfirmedServ
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestRequestKey");
     PositionAware positionAware = readBuffer;
@@ -110,28 +110,27 @@ public class BACnetConfirmedServiceRequestRequestKey extends BACnetConfirmedServ
     readBuffer.closeContext("BACnetConfirmedServiceRequestRequestKey");
     // Create the instance
     return new BACnetConfirmedServiceRequestRequestKeyBuilderImpl(
-        bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+        bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestRequestKeyBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] bytesOfRemovedService;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestRequestKeyBuilderImpl(
-        byte[] bytesOfRemovedService, Long serviceRequestLength, Long serviceRequestPayloadLength) {
-
+        byte[] bytesOfRemovedService, Long serviceRequestPayloadLength, Long serviceRequestLength) {
       this.bytesOfRemovedService = bytesOfRemovedService;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestRequestKey build(Long serviceRequestLength) {
 
       BACnetConfirmedServiceRequestRequestKey bACnetConfirmedServiceRequestRequestKey =
           new BACnetConfirmedServiceRequestRequestKey(
-              bytesOfRemovedService, serviceRequestLength, serviceRequestPayloadLength);
+              bytesOfRemovedService, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestRequestKey;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
index 06e075b31f..031a9949fd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOV.java
@@ -219,7 +219,6 @@ public class BACnetConfirmedServiceRequestSubscribeCOV extends BACnetConfirmedSe
         BACnetContextTagBoolean issueConfirmed,
         BACnetContextTagUnsignedInteger lifetimeInSeconds,
         Long serviceRequestLength) {
-
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.issueConfirmed = issueConfirmed;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
index 65746bc42e..ddcb28c9e7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVProperty.java
@@ -274,7 +274,6 @@ public class BACnetConfirmedServiceRequestSubscribeCOVProperty extends BACnetCon
         BACnetPropertyReferenceEnclosed monitoredPropertyIdentifier,
         BACnetContextTagReal covIncrement,
         Long serviceRequestLength) {
-
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.monitoredObjectIdentifier = monitoredObjectIdentifier;
       this.issueConfirmedNotifications = issueConfirmedNotifications;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
index 0b4e6b9c1e..93b62d42a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.java
@@ -257,7 +257,6 @@ public class BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
         BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList
             listOfCovSubscriptionSpecifications,
         Long serviceRequestLength) {
-
       this.subscriberProcessIdentifier = subscriberProcessIdentifier;
       this.issueConfirmedNotifications = issueConfirmedNotifications;
       this.lifetime = lifetime;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
index 06fec3a7e9..95e238e185 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestUnknown.java
@@ -47,15 +47,15 @@ public class BACnetConfirmedServiceRequestUnknown extends BACnetConfirmedService
   protected final byte[] unknownBytes;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestUnknown(
-      byte[] unknownBytes, Long serviceRequestLength, Long serviceRequestPayloadLength) {
+      byte[] unknownBytes, Long serviceRequestPayloadLength, Long serviceRequestLength) {
     super(serviceRequestLength);
     this.unknownBytes = unknownBytes;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public byte[] getUnknownBytes() {
@@ -95,7 +95,7 @@ public class BACnetConfirmedServiceRequestUnknown extends BACnetConfirmedService
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestUnknown");
     PositionAware positionAware = readBuffer;
@@ -108,28 +108,27 @@ public class BACnetConfirmedServiceRequestUnknown extends BACnetConfirmedService
     readBuffer.closeContext("BACnetConfirmedServiceRequestUnknown");
     // Create the instance
     return new BACnetConfirmedServiceRequestUnknownBuilderImpl(
-        unknownBytes, serviceRequestLength, serviceRequestPayloadLength);
+        unknownBytes, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestUnknownBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final byte[] unknownBytes;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestUnknownBuilderImpl(
-        byte[] unknownBytes, Long serviceRequestLength, Long serviceRequestPayloadLength) {
-
+        byte[] unknownBytes, Long serviceRequestPayloadLength, Long serviceRequestLength) {
       this.unknownBytes = unknownBytes;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestUnknown build(Long serviceRequestLength) {
 
       BACnetConfirmedServiceRequestUnknown bACnetConfirmedServiceRequestUnknown =
           new BACnetConfirmedServiceRequestUnknown(
-              unknownBytes, serviceRequestLength, serviceRequestPayloadLength);
+              unknownBytes, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestUnknown;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
index 038696c7bb..ec196dd118 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTClose.java
@@ -47,17 +47,17 @@ public class BACnetConfirmedServiceRequestVTClose extends BACnetConfirmedService
   protected final List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestVTClose(
       List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers,
-      Long serviceRequestLength,
-      Long serviceRequestPayloadLength) {
+      Long serviceRequestPayloadLength,
+      Long serviceRequestLength) {
     super(serviceRequestLength);
     this.listOfRemoteVtSessionIdentifiers = listOfRemoteVtSessionIdentifiers;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetApplicationTagUnsignedInteger> getListOfRemoteVtSessionIdentifiers() {
@@ -100,7 +100,7 @@ public class BACnetConfirmedServiceRequestVTClose extends BACnetConfirmedService
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestVTClose");
     PositionAware positionAware = readBuffer;
@@ -120,30 +120,29 @@ public class BACnetConfirmedServiceRequestVTClose extends BACnetConfirmedService
     readBuffer.closeContext("BACnetConfirmedServiceRequestVTClose");
     // Create the instance
     return new BACnetConfirmedServiceRequestVTCloseBuilderImpl(
-        listOfRemoteVtSessionIdentifiers, serviceRequestLength, serviceRequestPayloadLength);
+        listOfRemoteVtSessionIdentifiers, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestVTCloseBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestVTCloseBuilderImpl(
         List<BACnetApplicationTagUnsignedInteger> listOfRemoteVtSessionIdentifiers,
-        Long serviceRequestLength,
-        Long serviceRequestPayloadLength) {
-
+        Long serviceRequestPayloadLength,
+        Long serviceRequestLength) {
       this.listOfRemoteVtSessionIdentifiers = listOfRemoteVtSessionIdentifiers;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestVTClose build(Long serviceRequestLength) {
 
       BACnetConfirmedServiceRequestVTClose bACnetConfirmedServiceRequestVTClose =
           new BACnetConfirmedServiceRequestVTClose(
-              listOfRemoteVtSessionIdentifiers, serviceRequestLength, serviceRequestPayloadLength);
+              listOfRemoteVtSessionIdentifiers, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestVTClose;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
index 13282d86fc..d77cfa1218 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTData.java
@@ -169,7 +169,6 @@ public class BACnetConfirmedServiceRequestVTData extends BACnetConfirmedServiceR
         BACnetApplicationTagOctetString vtNewData,
         BACnetApplicationTagUnsignedInteger vtDataFlag,
         Long serviceRequestLength) {
-
       this.vtSessionIdentifier = vtSessionIdentifier;
       this.vtNewData = vtNewData;
       this.vtDataFlag = vtDataFlag;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
index 1b0c12751f..fd2ed3dc68 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestVTOpen.java
@@ -148,7 +148,6 @@ public class BACnetConfirmedServiceRequestVTOpen extends BACnetConfirmedServiceR
         BACnetVTClassTagged vtClass,
         BACnetApplicationTagUnsignedInteger localVtSessionIdentifier,
         Long serviceRequestLength) {
-
       this.vtClass = vtClass;
       this.localVtSessionIdentifier = localVtSessionIdentifier;
       this.serviceRequestLength = serviceRequestLength;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
index 92cf943b62..162e2cd519 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWriteProperty.java
@@ -242,7 +242,6 @@ public class BACnetConfirmedServiceRequestWriteProperty extends BACnetConfirmedS
         BACnetConstructedData propertyValue,
         BACnetContextTagUnsignedInteger priority,
         Long serviceRequestLength) {
-
       this.objectIdentifier = objectIdentifier;
       this.propertyIdentifier = propertyIdentifier;
       this.arrayIndex = arrayIndex;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
index 0829b2dd50..696faef176 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConfirmedServiceRequestWritePropertyMultiple.java
@@ -47,17 +47,17 @@ public class BACnetConfirmedServiceRequestWritePropertyMultiple
   protected final List<BACnetWriteAccessSpecification> data;
 
   // Arguments.
-  protected final Long serviceRequestLength;
   protected final Long serviceRequestPayloadLength;
+  protected final Long serviceRequestLength;
 
   public BACnetConfirmedServiceRequestWritePropertyMultiple(
       List<BACnetWriteAccessSpecification> data,
-      Long serviceRequestLength,
-      Long serviceRequestPayloadLength) {
+      Long serviceRequestPayloadLength,
+      Long serviceRequestLength) {
     super(serviceRequestLength);
     this.data = data;
-    this.serviceRequestLength = serviceRequestLength;
     this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+    this.serviceRequestLength = serviceRequestLength;
   }
 
   public List<BACnetWriteAccessSpecification> getData() {
@@ -99,7 +99,7 @@ public class BACnetConfirmedServiceRequestWritePropertyMultiple
 
   public static BACnetConfirmedServiceRequestBuilder
       staticParseBACnetConfirmedServiceRequestBuilder(
-          ReadBuffer readBuffer, Long serviceRequestLength, Long serviceRequestPayloadLength)
+          ReadBuffer readBuffer, Long serviceRequestPayloadLength, Long serviceRequestLength)
           throws ParseException {
     readBuffer.pullContext("BACnetConfirmedServiceRequestWritePropertyMultiple");
     PositionAware positionAware = readBuffer;
@@ -116,23 +116,22 @@ public class BACnetConfirmedServiceRequestWritePropertyMultiple
     readBuffer.closeContext("BACnetConfirmedServiceRequestWritePropertyMultiple");
     // Create the instance
     return new BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl(
-        data, serviceRequestLength, serviceRequestPayloadLength);
+        data, serviceRequestPayloadLength, serviceRequestLength);
   }
 
   public static class BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl
       implements BACnetConfirmedServiceRequest.BACnetConfirmedServiceRequestBuilder {
     private final List<BACnetWriteAccessSpecification> data;
-    private final Long serviceRequestLength;
     private final Long serviceRequestPayloadLength;
+    private final Long serviceRequestLength;
 
     public BACnetConfirmedServiceRequestWritePropertyMultipleBuilderImpl(
         List<BACnetWriteAccessSpecification> data,
-        Long serviceRequestLength,
-        Long serviceRequestPayloadLength) {
-
+        Long serviceRequestPayloadLength,
+        Long serviceRequestLength) {
       this.data = data;
-      this.serviceRequestLength = serviceRequestLength;
       this.serviceRequestPayloadLength = serviceRequestPayloadLength;
+      this.serviceRequestLength = serviceRequestLength;
     }
 
     public BACnetConfirmedServiceRequestWritePropertyMultiple build(Long serviceRequestLength) {
@@ -140,7 +139,7 @@ public class BACnetConfirmedServiceRequestWritePropertyMultiple
       BACnetConfirmedServiceRequestWritePropertyMultiple
           bACnetConfirmedServiceRequestWritePropertyMultiple =
               new BACnetConfirmedServiceRequestWritePropertyMultiple(
-                  data, serviceRequestLength, serviceRequestPayloadLength);
+                  data, serviceRequestPayloadLength, serviceRequestLength);
       return bACnetConfirmedServiceRequestWritePropertyMultiple;
     }
   }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
index 29bb85699c..0754d8e2dc 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDULength.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAPDULength extends BACnetConstructedData imple
         BACnetApplicationTagUnsignedInteger apduLength,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.apduLength = apduLength;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
index 76700a24f9..1bb4d3ec4e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUSegmentTimeout.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataAPDUSegmentTimeout extends BACnetConstructedDa
         BACnetApplicationTagUnsignedInteger apduSegmentTimeout,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.apduSegmentTimeout = apduSegmentTimeout;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
index bd0cfb5b28..788f677fe8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAPDUTimeout.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAPDUTimeout extends BACnetConstructedData impl
         BACnetApplicationTagUnsignedInteger apduTimeout,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.apduTimeout = apduTimeout;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
index 594ff8ab0f..8cd7c7fbae 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAbsenteeLimit.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAbsenteeLimit extends BACnetConstructedData im
         BACnetApplicationTagUnsignedInteger absenteeLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.absenteeLimit = absenteeLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
index dd9ce02cf7..3298b60693 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAcceptedModes.java
@@ -144,7 +144,6 @@ public class BACnetConstructedDataAcceptedModes extends BACnetConstructedData im
         List<BACnetLifeSafetyModeTagged> acceptedModes,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.acceptedModes = acceptedModes;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
index d23e9b538d..7a1400cc80 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessAlarmEvents.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccessAlarmEvents extends BACnetConstructedDat
         List<BACnetAccessEventTagged> accessAlarmEvents,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessAlarmEvents = accessAlarmEvents;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
index 345d0472b8..4e8b77d7d5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessCredentialAll.java
@@ -114,7 +114,6 @@ public class BACnetConstructedDataAccessCredentialAll extends BACnetConstructedD
 
     public BACnetConstructedDataAccessCredentialAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
index 71171f4271..bd4852248b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAlarmValues.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccessDoorAlarmValues extends BACnetConstructe
         List<BACnetDoorAlarmStateTagged> alarmValues,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.alarmValues = alarmValues;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
index 5439ea6e98..a9eefc259c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccessDoorAll extends BACnetConstructedData im
 
     public BACnetConstructedDataAccessDoorAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
index 7f30df7dca..5dc1599ee6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorFaultValues.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccessDoorFaultValues extends BACnetConstructe
         List<BACnetDoorAlarmStateTagged> faultValues,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultValues = faultValues;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
index 849856a14e..e88d3303f5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorPresentValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccessDoorPresentValue extends BACnetConstruct
         BACnetDoorValueTagged presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
index 956229127c..37f4c7291b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoorRelinquishDefault.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataAccessDoorRelinquishDefault extends BACnetCons
         BACnetDoorValueTagged relinquishDefault,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.relinquishDefault = relinquishDefault;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
index 173cc9bf5b..1ccad4eb01 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessDoors.java
@@ -186,7 +186,6 @@ public class BACnetConstructedDataAccessDoors extends BACnetConstructedData impl
         List<BACnetDeviceObjectReference> accessDoors,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.accessDoors = accessDoors;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
index 5b4c541669..d3e15dc244 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEvent.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAccessEvent extends BACnetConstructedData impl
         BACnetAccessEventTagged accessEvent,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessEvent = accessEvent;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
index bb99d62c3d..f938453c81 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventAuthenticationFactor.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataAccessEventAuthenticationFactor extends BACnet
         BACnetAuthenticationFactor accessEventAuthenticationFactor,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessEventAuthenticationFactor = accessEventAuthenticationFactor;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
index ed94e7da84..2af7097638 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventCredential.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccessEventCredential extends BACnetConstructe
         BACnetDeviceObjectReference accessEventCredential,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessEventCredential = accessEventCredential;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
index f74951438c..17ca039561 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTag.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAccessEventTag extends BACnetConstructedData i
         BACnetApplicationTagUnsignedInteger accessEventTag,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessEventTag = accessEventTag;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
index b7645ae497..cf469acf03 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessEventTime.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataAccessEventTime extends BACnetConstructedData
         BACnetTimeStamp accessEventTime,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessEventTime = accessEventTime;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
index c34d2cfa3d..10c265f5ed 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessPointAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccessPointAll extends BACnetConstructedData i
 
     public BACnetConstructedDataAccessPointAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
index d86b359d6d..da8b26a3af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessRightsAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccessRightsAll extends BACnetConstructedData
 
     public BACnetConstructedDataAccessRightsAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
index 57577b44f3..8dc3846276 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessTransactionEvents.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccessTransactionEvents extends BACnetConstruc
         List<BACnetAccessEventTagged> accessTransactionEvents,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accessTransactionEvents = accessTransactionEvents;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
index f93855ecb7..7ddb00cacf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessUserAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccessUserAll extends BACnetConstructedData im
 
     public BACnetConstructedDataAccessUserAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
index df8cbd1b28..964dac8b53 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAdjustValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccessZoneAdjustValue extends BACnetConstructe
         BACnetApplicationTagSignedInteger adjustValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.adjustValue = adjustValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
index d0a0ac34e4..e8d165b33d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAlarmValues.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccessZoneAlarmValues extends BACnetConstructe
         List<BACnetAccessZoneOccupancyStateTagged> alarmValues,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.alarmValues = alarmValues;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
index 430b0be407..bd73a322f1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccessZoneAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccessZoneAll extends BACnetConstructedData im
 
     public BACnetConstructedDataAccessZoneAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
index 2e47ad80c4..58f5758fb6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompaniment.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAccompaniment extends BACnetConstructedData im
         BACnetDeviceObjectReference accompaniment,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accompaniment = accompaniment;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
index de46a25415..1e417b7b3f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccompanimentTime.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataAccompanimentTime extends BACnetConstructedDat
         BACnetApplicationTagUnsignedInteger accompanimentTime,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.accompanimentTime = accompanimentTime;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
index 061758d52d..9d75642ff6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAccumulatorAll extends BACnetConstructedData i
 
     public BACnetConstructedDataAccumulatorAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
index 5b875b97af..7456d4e5ad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultHighLimit.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorFaultHighLimit extends BACnetConstr
         BACnetApplicationTagUnsignedInteger faultHighLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultHighLimit = faultHighLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
index 50c0af0134..aaa2a5391b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorFaultLowLimit.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorFaultLowLimit extends BACnetConstru
         BACnetApplicationTagUnsignedInteger faultLowLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultLowLimit = faultLowLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
index 28c6c475fd..5b25519bf5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorHighLimit.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorHighLimit extends BACnetConstructed
         BACnetApplicationTagUnsignedInteger highLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.highLimit = highLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
index 48f48ed896..781cca8f21 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorLowLimit.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorLowLimit extends BACnetConstructedD
         BACnetApplicationTagUnsignedInteger lowLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.lowLimit = lowLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
index 2172e07709..15ab77c153 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMaxPresValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorMaxPresValue extends BACnetConstruc
         BACnetApplicationTagUnsignedInteger maxPresValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.maxPresValue = maxPresValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
index ad939a21a9..1887af2f5b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAccumulatorMinPresValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAccumulatorMinPresValue extends BACnetConstruc
         BACnetApplicationTagUnsignedInteger minPresValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.minPresValue = minPresValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
index 7af3497746..056f1913a0 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckRequired.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAckRequired extends BACnetConstructedData impl
         BACnetEventTransitionBitsTagged ackRequired,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ackRequired = ackRequired;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
index 4efd2c9369..66564375aa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAckedTransitions.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataAckedTransitions extends BACnetConstructedData
         BACnetEventTransitionBitsTagged ackedTransitions,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ackedTransitions = ackedTransitions;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
index 26c9491f98..ce96d96c72 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAction.java
@@ -186,7 +186,6 @@ public class BACnetConstructedDataAction extends BACnetConstructedData implement
         List<BACnetActionList> actionLists,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.actionLists = actionLists;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
index 137889f33c..abb1963e15 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActionText.java
@@ -189,7 +189,6 @@ public class BACnetConstructedDataActionText extends BACnetConstructedData imple
         List<BACnetApplicationTagCharacterString> actionText,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.actionText = actionText;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
index b555316c4b..40366d968f 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActivationTime.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataActivationTime extends BACnetConstructedData i
         BACnetDateTime activationTime,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activationTime = activationTime;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
index 40b33ec0b8..1fc8c8b8c4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveAuthenticationPolicy.java
@@ -153,7 +153,6 @@ public class BACnetConstructedDataActiveAuthenticationPolicy extends BACnetConst
         BACnetApplicationTagUnsignedInteger activeAuthenticationPolicy,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activeAuthenticationPolicy = activeAuthenticationPolicy;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
index 7db5f9331b..f99ef3b8bf 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVMultipleSubscriptions.java
@@ -143,7 +143,6 @@ public class BACnetConstructedDataActiveCOVMultipleSubscriptions extends BACnetC
         List<BACnetCOVMultipleSubscription> activeCOVMultipleSubscriptions,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activeCOVMultipleSubscriptions = activeCOVMultipleSubscriptions;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
index 9a1222009d..51d7f55a73 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveCOVSubscriptions.java
@@ -142,7 +142,6 @@ public class BACnetConstructedDataActiveCOVSubscriptions extends BACnetConstruct
         List<BACnetCOVSubscription> activeCOVSubscriptions,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activeCOVSubscriptions = activeCOVSubscriptions;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
index efbdb4513a..b1470d2a14 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveText.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataActiveText extends BACnetConstructedData imple
         BACnetApplicationTagCharacterString activeText,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activeText = activeText;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
index 276c54439e..2fc3ce01b3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActiveVTSessions.java
@@ -142,7 +142,6 @@ public class BACnetConstructedDataActiveVTSessions extends BACnetConstructedData
         List<BACnetVTSession> activeVTSession,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.activeVTSession = activeVTSession;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
index fc5c8c1e5b..b6e351affd 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataActualShedLevel.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataActualShedLevel extends BACnetConstructedData
         BACnetShedLevel actualShedLevel,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.actualShedLevel = actualShedLevel;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
index 6ae6250e5c..99b6bf379b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAdjustValue.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAdjustValue extends BACnetConstructedData impl
         BACnetApplicationTagSignedInteger adjustValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.adjustValue = adjustValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
index c42fd5db94..8c747b1207 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAlarmValue extends BACnetConstructedData imple
         BACnetBinaryPVTagged binaryPv,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.binaryPv = binaryPv;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
index c5f076090f..56859d17af 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlarmValues.java
@@ -189,7 +189,6 @@ public class BACnetConstructedDataAlarmValues extends BACnetConstructedData impl
         List<BACnetLifeSafetyStateTagged> alarmValues,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.alarmValues = alarmValues;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
index 337ba17dc3..b84da5c1be 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentAll.java
@@ -114,7 +114,6 @@ public class BACnetConstructedDataAlertEnrollmentAll extends BACnetConstructedDa
 
     public BACnetConstructedDataAlertEnrollmentAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
index f820d5a2a9..97e80c0c85 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlertEnrollmentPresentValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataAlertEnrollmentPresentValue extends BACnetCons
         BACnetApplicationTagObjectIdentifier presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
index c09f4e05c7..bc6c052ef1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAlignIntervals.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataAlignIntervals extends BACnetConstructedData i
         BACnetApplicationTagBoolean alignIntervals,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.alignIntervals = alignIntervals;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
index f8ade4108e..ba270805df 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllWritesSuccessful.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAllWritesSuccessful extends BACnetConstructedD
         BACnetApplicationTagBoolean allWritesSuccessful,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.allWritesSuccessful = allWritesSuccessful;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
index da9dcb70d8..ab3bb29260 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAllowGroupDelayInhibit.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataAllowGroupDelayInhibit extends BACnetConstruct
         BACnetApplicationTagBoolean allowGroupDelayInhibit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.allowGroupDelayInhibit = allowGroupDelayInhibit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
index 181c0c901f..d484b2da29 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAnalogInputAll extends BACnetConstructedData i
 
     public BACnetConstructedDataAnalogInputAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
index 8ca446d21d..24fade6d62 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultHighLimit.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogInputFaultHighLimit extends BACnetConstr
         BACnetApplicationTagReal faultHighLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultHighLimit = faultHighLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
index 4ef4372255..9849e8af8e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputFaultLowLimit.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogInputFaultLowLimit extends BACnetConstru
         BACnetApplicationTagReal faultLowLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultLowLimit = faultLowLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
index 8f90076c1e..32e41cc940 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputInterfaceValue.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataAnalogInputInterfaceValue extends BACnetConstr
         BACnetOptionalREAL interfaceValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.interfaceValue = interfaceValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
index 540ec0c2c1..7376d5bb3b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputMaxPresValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogInputMaxPresValue extends BACnetConstruc
         BACnetApplicationTagReal maxPresValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.maxPresValue = maxPresValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
index 37d263bb26..89696a5389 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogInputPresentValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogInputPresentValue extends BACnetConstruc
         BACnetApplicationTagReal presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
index 0c4e844c91..2afb6fd73e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAnalogOutputAll extends BACnetConstructedData
 
     public BACnetConstructedDataAnalogOutputAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
index 2d79d37908..71bc09b6db 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputInterfaceValue.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataAnalogOutputInterfaceValue extends BACnetConst
         BACnetOptionalREAL interfaceValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.interfaceValue = interfaceValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
index 25c35ab1dc..70eb3e4fce 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputMaxPresValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogOutputMaxPresValue extends BACnetConstru
         BACnetApplicationTagReal maxPresValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.maxPresValue = maxPresValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
index da0d3e16ee..9928b8d7ce 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputPresentValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogOutputPresentValue extends BACnetConstru
         BACnetApplicationTagReal presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
index f09600d4fc..9482eacb8d 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogOutputRelinquishDefault.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAnalogOutputRelinquishDefault extends BACnetCo
         BACnetApplicationTagReal relinquishDefault,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.relinquishDefault = relinquishDefault;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
index 364f80e244..2efc500f2a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAnalogValueAll extends BACnetConstructedData i
 
     public BACnetConstructedDataAnalogValueAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
index f8703f25bd..937898817e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultHighLimit.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogValueFaultHighLimit extends BACnetConstr
         BACnetApplicationTagReal faultHighLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultHighLimit = faultHighLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
index 64da2a0def..62cc96837e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueFaultLowLimit.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogValueFaultLowLimit extends BACnetConstru
         BACnetApplicationTagReal faultLowLimit,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.faultLowLimit = faultLowLimit;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
index c5a40acf56..a4599df7df 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueMaxPresValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogValueMaxPresValue extends BACnetConstruc
         BACnetApplicationTagReal maxPresValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.maxPresValue = maxPresValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
index 9dbc7afee4..13f4d07ec4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValuePresentValue.java
@@ -147,7 +147,6 @@ public class BACnetConstructedDataAnalogValuePresentValue extends BACnetConstruc
         BACnetApplicationTagReal presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
index 2ba4899b81..0549bfe0bb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAnalogValueRelinquishDefault.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAnalogValueRelinquishDefault extends BACnetCon
         BACnetApplicationTagReal relinquishDefault,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.relinquishDefault = relinquishDefault;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
index 38c91b1e00..f2bd6c93f4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataApplicationSoftwareVersion.java
@@ -153,7 +153,6 @@ public class BACnetConstructedDataApplicationSoftwareVersion extends BACnetConst
         BACnetApplicationTagCharacterString applicationSoftwareVersion,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.applicationSoftwareVersion = applicationSoftwareVersion;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
index ed2c1e33a6..b3d6994b30 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataArchive.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataArchive extends BACnetConstructedData implemen
         BACnetApplicationTagBoolean archive,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.archive = archive;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
index 46e5a1f2d7..53e0e411a5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedAccessRights.java
@@ -187,7 +187,6 @@ public class BACnetConstructedDataAssignedAccessRights extends BACnetConstructed
         List<BACnetAssignedAccessRights> assignedAccessRights,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.assignedAccessRights = assignedAccessRights;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
index a21ff3c45a..ccebfcf1eb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAssignedLandingCalls.java
@@ -187,7 +187,6 @@ public class BACnetConstructedDataAssignedLandingCalls extends BACnetConstructed
         List<BACnetAssignedLandingCalls> assignedLandingCalls,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.assignedLandingCalls = assignedLandingCalls;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
index 7f81ad4f60..58b02ba9d6 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAttemptedSamples.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataAttemptedSamples extends BACnetConstructedData
         BACnetApplicationTagUnsignedInteger attemptedSamples,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.attemptedSamples = attemptedSamples;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
index 7d0bc91765..7dcfacde62 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationFactors.java
@@ -187,7 +187,6 @@ public class BACnetConstructedDataAuthenticationFactors extends BACnetConstructe
         List<BACnetCredentialAuthenticationFactor> authenticationFactors,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationFactors = authenticationFactors;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
index af07ff5d2d..b7794b68ce 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyList.java
@@ -187,7 +187,6 @@ public class BACnetConstructedDataAuthenticationPolicyList extends BACnetConstru
         List<BACnetAuthenticationPolicy> authenticationPolicyList,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationPolicyList = authenticationPolicyList;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
index 0a32588553..9bba49715b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationPolicyNames.java
@@ -190,7 +190,6 @@ public class BACnetConstructedDataAuthenticationPolicyNames extends BACnetConstr
         List<BACnetApplicationTagCharacterString> authenticationPolicyNames,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.numberOfDataElements = numberOfDataElements;
       this.authenticationPolicyNames = authenticationPolicyNames;
       this.tagNumber = tagNumber;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
index 86c282f35d..9574bb9ad9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthenticationStatus.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataAuthenticationStatus extends BACnetConstructed
         BACnetAuthenticationStatusTagged authenticationStatus,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.authenticationStatus = authenticationStatus;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
index 96fa522a7f..5bd44cc9e5 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationExemptions.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataAuthorizationExemptions extends BACnetConstruc
         List<BACnetAuthorizationExemptionTagged> authorizationExemption,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.authorizationExemption = authorizationExemption;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
index 0ada2ec180..c50e9e0a87 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAuthorizationMode.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataAuthorizationMode extends BACnetConstructedDat
         BACnetAuthorizationModeTagged authorizationMode,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.authorizationMode = authorizationMode;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
index fd223192e0..a53ac27050 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAutoSlaveDiscovery.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataAutoSlaveDiscovery extends BACnetConstructedDa
         BACnetApplicationTagBoolean autoSlaveDiscovery,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.autoSlaveDiscovery = autoSlaveDiscovery;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
index fa927e1fdc..8cf35acac8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAverageValue.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataAverageValue extends BACnetConstructedData imp
         BACnetApplicationTagReal averageValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.averageValue = averageValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
index c2dcc802ba..af74aee808 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataAveragingAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataAveragingAll extends BACnetConstructedData imp
 
     public BACnetConstructedDataAveragingAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
index 05f7cd569f..41ea577b07 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPGlobalAddress.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBACnetIPGlobalAddress extends BACnetConstructe
         BACnetHostNPort bacnetIpGlobalAddress,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bacnetIpGlobalAddress = bacnetIpGlobalAddress;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
index 7995713de8..ad52b453d1 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMode.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataBACnetIPMode extends BACnetConstructedData imp
         BACnetIPModeTagged bacnetIpMode,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bacnetIpMode = bacnetIpMode;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
index 9f2ca7a7da..e3ec9fd10a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPMulticastAddress.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBACnetIPMulticastAddress extends BACnetConstru
         BACnetApplicationTagOctetString ipMulticastAddress,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ipMulticastAddress = ipMulticastAddress;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
index 29cb33f8bd..f27c329e76 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPNATTraversal.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataBACnetIPNATTraversal extends BACnetConstructed
         BACnetApplicationTagBoolean bacnetIPNATTraversal,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bacnetIPNATTraversal = bacnetIPNATTraversal;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
index 93811bd3f3..120bb99daa 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPUDPPort.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataBACnetIPUDPPort extends BACnetConstructedData
         BACnetApplicationTagUnsignedInteger ipUdpPort,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ipUdpPort = ipUdpPort;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
index 8b38c037f7..8d3f60c48e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6Mode.java
@@ -148,7 +148,6 @@ public class BACnetConstructedDataBACnetIPv6Mode extends BACnetConstructedData i
         BACnetIPModeTagged bacnetIpv6Mode,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bacnetIpv6Mode = bacnetIpv6Mode;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
index 83b34c8c07..24177200b4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6MulticastAddress.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataBACnetIPv6MulticastAddress extends BACnetConst
         BACnetApplicationTagOctetString ipv6MulticastAddress,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ipv6MulticastAddress = ipv6MulticastAddress;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
index a0adbc1a7c..d086b30770 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBACnetIPv6UDPPort.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBACnetIPv6UDPPort extends BACnetConstructedDat
         BACnetApplicationTagUnsignedInteger ipv6UdpPort,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.ipv6UdpPort = ipv6UdpPort;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
index d153a41101..e67c75ae1e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDAcceptFDRegistrations.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataBBMDAcceptFDRegistrations extends BACnetConstr
         BACnetApplicationTagBoolean bbmdAcceptFDRegistrations,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bbmdAcceptFDRegistrations = bbmdAcceptFDRegistrations;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
index 7fded1830c..dd7ba9490b 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDBroadcastDistributionTable.java
@@ -143,7 +143,6 @@ public class BACnetConstructedDataBBMDBroadcastDistributionTable extends BACnetC
         List<BACnetBDTEntry> bbmdBroadcastDistributionTable,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bbmdBroadcastDistributionTable = bbmdBroadcastDistributionTable;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
index 35b3abf737..e4fa863e7c 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBBMDForeignDeviceTable.java
@@ -142,7 +142,6 @@ public class BACnetConstructedDataBBMDForeignDeviceTable extends BACnetConstruct
         List<BACnetBDTEntry> bbmdForeignDeviceTable,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bbmdForeignDeviceTable = bbmdForeignDeviceTable;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
index 9938bddad9..cb74b8caad 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupAndRestoreState.java
@@ -152,7 +152,6 @@ public class BACnetConstructedDataBackupAndRestoreState extends BACnetConstructe
         BACnetBackupStateTagged backupAndRestoreState,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.backupAndRestoreState = backupAndRestoreState;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
index 8623d3b43c..a9cabc2dd3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupFailureTimeout.java
@@ -151,7 +151,6 @@ public class BACnetConstructedDataBackupFailureTimeout extends BACnetConstructed
         BACnetApplicationTagUnsignedInteger backupFailureTimeout,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.backupFailureTimeout = backupFailureTimeout;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
index c17337168c..21fd5a28c3 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBackupPreparationTime.java
@@ -153,7 +153,6 @@ public class BACnetConstructedDataBackupPreparationTime extends BACnetConstructe
         BACnetApplicationTagUnsignedInteger backupPreparationTime,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.backupPreparationTime = backupPreparationTime;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
index 605450ac15..77795cab51 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBaseDeviceSecurityPolicy.java
@@ -152,7 +152,6 @@ public class BACnetConstructedDataBaseDeviceSecurityPolicy extends BACnetConstru
         BACnetSecurityLevelTagged baseDeviceSecurityPolicy,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.baseDeviceSecurityPolicy = baseDeviceSecurityPolicy;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
index c2065ac7ea..8dd3310c24 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBelongsTo.java
@@ -144,7 +144,6 @@ public class BACnetConstructedDataBelongsTo extends BACnetConstructedData implem
         BACnetDeviceObjectReference belongsTo,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.belongsTo = belongsTo;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
index a3e50e8781..8f2a581570 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBias.java
@@ -145,7 +145,6 @@ public class BACnetConstructedDataBias extends BACnetConstructedData implements
         BACnetApplicationTagReal bias,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.bias = bias;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
index 6ea2c12b0e..3c7e4510b4 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataBinaryInputAll extends BACnetConstructedData i
 
     public BACnetConstructedDataBinaryInputAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
index c00a33f738..91bcad7cbb 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputInterfaceValue.java
@@ -146,7 +146,6 @@ public class BACnetConstructedDataBinaryInputInterfaceValue extends BACnetConstr
         BACnetOptionalBinaryPV interfaceValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.interfaceValue = interfaceValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
index b1c778af46..7a97601f51 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryInputPresentValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBinaryInputPresentValue extends BACnetConstruc
         BACnetBinaryPVTagged presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
index e577ac702b..d9a040790e 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputAll.java
@@ -115,7 +115,6 @@ public class BACnetConstructedDataBinaryLightingOutputAll extends BACnetConstruc
 
     public BACnetConstructedDataBinaryLightingOutputAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
index 351b34c6de..65ca7448f2 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputFeedbackValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBinaryLightingOutputFeedbackValue extends BACn
         BACnetBinaryLightingPVTagged feedbackValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.feedbackValue = feedbackValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
index 6f341f56a1..84f0b77c7a 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputPresentValue.java
@@ -149,7 +149,6 @@ public class BACnetConstructedDataBinaryLightingOutputPresentValue extends BACne
         BACnetBinaryLightingPVTagged presentValue,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.presentValue = presentValue;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
index f9c85ef80a..722e4103c8 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.java
@@ -150,7 +150,6 @@ public class BACnetConstructedDataBinaryLightingOutputRelinquishDefault
         BACnetBinaryLightingPVTagged relinquishDefault,
         Short tagNumber,
         BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.relinquishDefault = relinquishDefault;
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
index 6779c1959b..a5725e70a7 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputAll.java
@@ -113,7 +113,6 @@ public class BACnetConstructedDataBinaryOutputAll extends BACnetConstructedData
 
     public BACnetConstructedDataBinaryOutputAllBuilderImpl(
         Short tagNumber, BACnetTagPayloadUnsignedInteger arrayIndexArgument) {
-
       this.tagNumber = tagNumber;
       this.arrayIndexArgument = arrayIndexArgument;
     }
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetConstructedDataBinaryOutputFeedbackValue.java
... 41046 lines suppressed ...