From 6cc035da17ff94e258004d370b342259f0ce853b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20R=C3=BChl?= <sruehl@apache.org>
Date: Fri, 27 Sep 2024 08:17:43 +0200
Subject: [PATCH] fix(code-gen/go): disable builder temporary for discriminated
 types

---
 .../go/complex-type-template.go.ftlh          |   4 +-
 plc4go/internal/ads/Subscriber.go             |   1 -
 .../bacgopes/apdu/apdu_ComplexAckPDU.go       |   4 +
 .../bacgopes/apdu/apdu_ConfirmedRequestPDU.go |   5 +
 .../bacnetip/bacgopes/apdu/apdu_ErrorPDU.go   |   5 +
 .../bacgopes/apdu/apdu_SimpleAckPDU.go        |   4 +
 .../apdu/apdu_UnconfirmedRequestPDU.go        |   4 +
 .../protocols/abeth/readwrite/ParserHelper.go |   3 +-
 .../abeth/readwrite/XmlParserHelper.go        |   3 +-
 .../CIPEncapsulationConnectionRequest.go      |   4 +-
 .../CIPEncapsulationConnectionResponse.go     |   4 +-
 .../readwrite/model/CIPEncapsulationPacket.go |   6 +-
 .../model/CIPEncapsulationReadRequest.go      |  21 +-
 .../model/CIPEncapsulationReadResponse.go     |  21 +-
 .../model/DF1CommandRequestMessage.go         |  21 +-
 ...esponseMessageProtectedTypedLogicalRead.go |   6 +-
 .../readwrite/model/DF1RequestCommand.go      |   6 +-
 .../readwrite/model/DF1RequestMessage.go      |   6 +-
 .../DF1RequestProtectedTypedLogicalRead.go    |   6 +-
 .../readwrite/model/DF1ResponseMessage.go     |   6 +-
 .../ads/discovery/readwrite/ParserHelper.go   |   3 +-
 .../discovery/readwrite/XmlParserHelper.go    |   3 +-
 .../discovery/readwrite/model/AdsDiscovery.go |   6 +-
 .../readwrite/model/AdsDiscoveryBlock.go      |   6 +-
 .../model/AdsDiscoveryBlockAmsNetId.go        |   6 +-
 .../model/AdsDiscoveryBlockFingerprint.go     |   6 +-
 .../model/AdsDiscoveryBlockHostName.go        |   6 +-
 .../model/AdsDiscoveryBlockOsData.go          |   6 +-
 .../model/AdsDiscoveryBlockPassword.go        |   6 +-
 .../model/AdsDiscoveryBlockRouteName.go       |   6 +-
 .../model/AdsDiscoveryBlockStatus.go          |   6 +-
 .../readwrite/model/AdsDiscoveryBlockType.go  |   4 +-
 .../model/AdsDiscoveryBlockUserName.go        |   6 +-
 .../model/AdsDiscoveryBlockVersion.go         |   6 +-
 .../readwrite/model/AdsDiscoveryConstants.go  |   6 +-
 .../readwrite/model/AdsPortNumbers.go         |   4 +-
 .../ads/discovery/readwrite/model/AmsNetId.go |   6 +-
 .../discovery/readwrite/model/AmsString.go    |   6 +-
 .../discovery/readwrite/model/Operation.go    |   4 +-
 .../ads/discovery/readwrite/model/Status.go   |   4 +-
 .../protocols/ads/readwrite/ParserHelper.go   |   3 +-
 .../ads/readwrite/XmlParserHelper.go          |   3 +-
 .../model/AdsAddDeviceNotificationRequest.go  |   6 +-
 .../model/AdsAddDeviceNotificationResponse.go |   6 +-
 .../ads/readwrite/model/AdsConstants.go       |   6 +-
 .../ads/readwrite/model/AdsDataType.go        |   4 +-
 .../readwrite/model/AdsDataTypeArrayInfo.go   |   6 +-
 .../model/AdsDataTypeTableChildEntry.go       |   6 +-
 .../readwrite/model/AdsDataTypeTableEntry.go  |   6 +-
 .../AdsDeleteDeviceNotificationRequest.go     |   6 +-
 .../AdsDeleteDeviceNotificationResponse.go    |   6 +-
 .../model/AdsDeviceNotificationRequest.go     |   6 +-
 .../model/AdsDeviceNotificationResponse.go    |   4 +-
 .../ads/readwrite/model/AdsInvalidRequest.go  |   4 +-
 .../ads/readwrite/model/AdsInvalidResponse.go |   4 +-
 .../readwrite/model/AdsMultiRequestItem.go    |   4 +-
 .../model/AdsMultiRequestItemRead.go          |   6 +-
 .../model/AdsMultiRequestItemReadWrite.go     |   6 +-
 .../model/AdsMultiRequestItemWrite.go         |   6 +-
 .../readwrite/model/AdsNotificationSample.go  |   6 +-
 .../model/AdsReadDeviceInfoRequest.go         |   4 +-
 .../model/AdsReadDeviceInfoResponse.go        |   6 +-
 .../ads/readwrite/model/AdsReadRequest.go     |   6 +-
 .../ads/readwrite/model/AdsReadResponse.go    |   6 +-
 .../readwrite/model/AdsReadStateRequest.go    |   4 +-
 .../readwrite/model/AdsReadStateResponse.go   |   6 +-
 .../readwrite/model/AdsReadWriteRequest.go    |   6 +-
 .../readwrite/model/AdsReadWriteResponse.go   |   6 +-
 .../ads/readwrite/model/AdsStampHeader.go     |   6 +-
 .../readwrite/model/AdsSymbolTableEntry.go    |   6 +-
 .../ads/readwrite/model/AdsTableSizes.go      |   6 +-
 .../ads/readwrite/model/AdsTransMode.go       |   4 +-
 .../readwrite/model/AdsWriteControlRequest.go |   6 +-
 .../model/AdsWriteControlResponse.go          |   6 +-
 .../ads/readwrite/model/AdsWriteRequest.go    |   6 +-
 .../ads/readwrite/model/AdsWriteResponse.go   |   6 +-
 .../protocols/ads/readwrite/model/AmsNetId.go |   6 +-
 .../ads/readwrite/model/AmsPacket.go          |   6 +-
 .../model/AmsSerialAcknowledgeFrame.go        |   6 +-
 .../ads/readwrite/model/AmsSerialFrame.go     |  21 +-
 .../readwrite/model/AmsSerialResetFrame.go    |   6 +-
 .../ads/readwrite/model/AmsTCPPacket.go       |  21 +-
 .../ads/readwrite/model/CommandId.go          |   4 +-
 .../protocols/ads/readwrite/model/DataItem.go |   6 +-
 .../ads/readwrite/model/DefaultAmsPorts.go    |   4 +-
 .../ads/readwrite/model/ErrorResponse.go      |   4 +-
 .../ads/readwrite/model/PlcValueType.go       |   4 +-
 .../readwrite/model/ReservedIndexGroups.go    |   4 +-
 .../ads/readwrite/model/ReturnCode.go         |   4 +-
 .../bacnetip/readwrite/ParserHelper.go        |   3 +-
 .../bacnetip/readwrite/XmlParserHelper.go     |   3 +-
 .../bacnetip/readwrite/model/APDU.go          |   6 +-
 .../bacnetip/readwrite/model/APDUAbort.go     |   6 +-
 .../readwrite/model/APDUComplexAck.go         |  21 +-
 .../readwrite/model/APDUConfirmedRequest.go   |  21 +-
 .../bacnetip/readwrite/model/APDUError.go     |  21 +-
 .../bacnetip/readwrite/model/APDUReject.go    |   6 +-
 .../readwrite/model/APDUSegmentAck.go         |   6 +-
 .../bacnetip/readwrite/model/APDUSimpleAck.go |   6 +-
 .../readwrite/model/APDUUnconfirmedRequest.go |  21 +-
 .../bacnetip/readwrite/model/APDUUnknown.go   |   6 +-
 .../bacnetip/readwrite/model/ApduType.go      |   4 +-
 .../readwrite/model/BACnetAbortReason.go      |   4 +-
 .../model/BACnetAbortReasonTagged.go          |   6 +-
 ...BACnetAccessAuthenticationFactorDisable.go |   4 +-
 ...AccessAuthenticationFactorDisableTagged.go |   6 +-
 .../model/BACnetAccessCredentialDisable.go    |   4 +-
 .../BACnetAccessCredentialDisableReason.go    |   4 +-
 ...CnetAccessCredentialDisableReasonTagged.go |   6 +-
 .../BACnetAccessCredentialDisableTagged.go    |   6 +-
 .../readwrite/model/BACnetAccessEvent.go      |   4 +-
 .../model/BACnetAccessEventTagged.go          |   6 +-
 .../model/BACnetAccessPassbackMode.go         |   4 +-
 .../model/BACnetAccessPassbackModeTagged.go   |   6 +-
 .../readwrite/model/BACnetAccessRule.go       |   6 +-
 .../BACnetAccessRuleLocationSpecifier.go      |   4 +-
 ...BACnetAccessRuleLocationSpecifierTagged.go |   6 +-
 .../BACnetAccessRuleTimeRangeSpecifier.go     |   4 +-
 ...ACnetAccessRuleTimeRangeSpecifierTagged.go |   6 +-
 .../model/BACnetAccessThreatLevel.go          |   6 +-
 .../readwrite/model/BACnetAccessUserType.go   |   4 +-
 .../model/BACnetAccessUserTypeTagged.go       |   6 +-
 .../model/BACnetAccessZoneOccupancyState.go   |   4 +-
 .../BACnetAccessZoneOccupancyStateTagged.go   |   6 +-
 .../model/BACnetAccumulatorRecord.go          |   6 +-
 ...ACnetAccumulatorRecordAccumulatorStatus.go |   4 +-
 ...ccumulatorRecordAccumulatorStatusTagged.go |   6 +-
 .../bacnetip/readwrite/model/BACnetAction.go  |   4 +-
 .../readwrite/model/BACnetActionCommand.go    |  21 +-
 .../readwrite/model/BACnetActionList.go       |   6 +-
 .../readwrite/model/BACnetActionTagged.go     |   6 +-
 .../bacnetip/readwrite/model/BACnetAddress.go |   6 +-
 .../readwrite/model/BACnetAddressBinding.go   |   6 +-
 .../readwrite/model/BACnetAddressEnclosed.go  |   6 +-
 .../readwrite/model/BACnetApplicationTag.go   |   6 +-
 .../model/BACnetApplicationTagBitString.go    |   6 +-
 .../model/BACnetApplicationTagBoolean.go      |   6 +-
 .../BACnetApplicationTagCharacterString.go    |   6 +-
 .../model/BACnetApplicationTagDate.go         |   6 +-
 .../model/BACnetApplicationTagDouble.go       |   6 +-
 .../model/BACnetApplicationTagEnumerated.go   |   6 +-
 .../model/BACnetApplicationTagNull.go         |   4 +-
 .../BACnetApplicationTagObjectIdentifier.go   |   6 +-
 .../model/BACnetApplicationTagOctetString.go  |   6 +-
 .../model/BACnetApplicationTagReal.go         |   6 +-
 .../BACnetApplicationTagSignedInteger.go      |   6 +-
 .../model/BACnetApplicationTagTime.go         |   6 +-
 .../BACnetApplicationTagUnsignedInteger.go    |   6 +-
 .../model/BACnetAssignedAccessRights.go       |   6 +-
 .../model/BACnetAssignedLandingCalls.go       |   6 +-
 ...netAssignedLandingCallsLandingCallsList.go |   6 +-
 ...signedLandingCallsLandingCallsListEntry.go |   6 +-
 .../model/BACnetAuthenticationFactor.go       |   6 +-
 .../BACnetAuthenticationFactorEnclosed.go     |   6 +-
 .../model/BACnetAuthenticationFactorFormat.go |   6 +-
 .../model/BACnetAuthenticationFactorType.go   |   4 +-
 .../BACnetAuthenticationFactorTypeTagged.go   |   6 +-
 .../model/BACnetAuthenticationPolicy.go       |   6 +-
 .../model/BACnetAuthenticationPolicyList.go   |   6 +-
 .../BACnetAuthenticationPolicyListEntry.go    |   6 +-
 .../model/BACnetAuthenticationStatus.go       |   4 +-
 .../model/BACnetAuthenticationStatusTagged.go |   6 +-
 .../model/BACnetAuthorizationExemption.go     |   4 +-
 .../BACnetAuthorizationExemptionTagged.go     |   6 +-
 .../model/BACnetAuthorizationMode.go          |   4 +-
 .../model/BACnetAuthorizationModeTagged.go    |   6 +-
 .../readwrite/model/BACnetBDTEntry.go         |   6 +-
 .../readwrite/model/BACnetBackupState.go      |   4 +-
 .../model/BACnetBackupStateTagged.go          |   6 +-
 .../readwrite/model/BACnetBinaryLightingPV.go |   4 +-
 .../model/BACnetBinaryLightingPVTagged.go     |   6 +-
 .../readwrite/model/BACnetBinaryPV.go         |   4 +-
 .../readwrite/model/BACnetBinaryPVTagged.go   |   6 +-
 .../model/BACnetCOVMultipleSubscription.go    |   6 +-
 ...ptionListOfCovSubscriptionSpecification.go |   6 +-
 ...ListOfCovSubscriptionSpecificationEntry.go |   6 +-
 ...onSpecificationEntryListOfCovReferences.go |   6 +-
 ...cificationEntryListOfCovReferencesEntry.go |   6 +-
 .../readwrite/model/BACnetCOVSubscription.go  |   6 +-
 .../readwrite/model/BACnetCalendarEntry.go    |   6 +-
 .../model/BACnetCalendarEntryDate.go          |   6 +-
 .../model/BACnetCalendarEntryDateRange.go     |   6 +-
 .../model/BACnetCalendarEntryEnclosed.go      |  21 +-
 .../model/BACnetCalendarEntryWeekNDay.go      |   6 +-
 .../readwrite/model/BACnetChannelValue.go     |   6 +-
 .../model/BACnetChannelValueBitString.go      |   6 +-
 .../model/BACnetChannelValueBoolean.go        |   6 +-
 .../BACnetChannelValueCharacterString.go      |   6 +-
 .../readwrite/model/BACnetChannelValueDate.go |   6 +-
 .../model/BACnetChannelValueDouble.go         |   6 +-
 .../model/BACnetChannelValueEnumerated.go     |   6 +-
 .../model/BACnetChannelValueInteger.go        |   6 +-
 .../BACnetChannelValueLightingCommand.go      |   6 +-
 .../readwrite/model/BACnetChannelValueNull.go |   6 +-
 .../BACnetChannelValueObjectidentifier.go     |   6 +-
 .../model/BACnetChannelValueOctetString.go    |   6 +-
 .../readwrite/model/BACnetChannelValueReal.go |   6 +-
 .../readwrite/model/BACnetChannelValueTime.go |   6 +-
 .../model/BACnetChannelValueUnsigned.go       |   6 +-
 .../model/BACnetCharacterEncoding.go          |   4 +-
 .../readwrite/model/BACnetClientCOV.go        |   6 +-
 .../readwrite/model/BACnetClientCOVNone.go    |   6 +-
 .../readwrite/model/BACnetClientCOVObject.go  |   6 +-
 .../readwrite/model/BACnetClosingTag.go       |   6 +-
 .../model/BACnetConfirmedServiceChoice.go     |   4 +-
 .../model/BACnetConfirmedServiceRequest.go    |   6 +-
 ...ConfirmedServiceRequestAcknowledgeAlarm.go |   6 +-
 ...etConfirmedServiceRequestAddListElement.go |  21 +-
 ...etConfirmedServiceRequestAtomicReadFile.go |  21 +-
 ...irmedServiceRequestAtomicReadFileRecord.go |   6 +-
 ...irmedServiceRequestAtomicReadFileStream.go |   6 +-
 ...viceRequestAtomicReadFileStreamOrRecord.go |   6 +-
 ...tConfirmedServiceRequestAtomicWriteFile.go |   6 +-
 ...CnetConfirmedServiceRequestAuthenticate.go |   6 +-
 ...dServiceRequestConfirmedCOVNotification.go |   6 +-
 ...RequestConfirmedCOVNotificationMultiple.go |   6 +-
 ...erviceRequestConfirmedEventNotification.go |  21 +-
 ...dServiceRequestConfirmedPrivateTransfer.go |  21 +-
 ...irmedServiceRequestConfirmedTextMessage.go |  21 +-
 ...RequestConfirmedTextMessageMessageClass.go |   6 +-
 ...nfirmedTextMessageMessageClassCharacter.go |   6 +-
 ...ConfirmedTextMessageMessageClassNumeric.go |   6 +-
 ...uestConfirmedTextMessageMessagePriority.go |   4 +-
 ...nfirmedTextMessageMessagePriorityTagged.go |   6 +-
 ...CnetConfirmedServiceRequestCreateObject.go |   6 +-
 ...rviceRequestCreateObjectObjectSpecifier.go |   6 +-
 ...CnetConfirmedServiceRequestDeleteObject.go |   6 +-
 ...erviceRequestDeviceCommunicationControl.go |   6 +-
 ...DeviceCommunicationControlEnableDisable.go |   4 +-
 ...CommunicationControlEnableDisableTagged.go |   6 +-
 ...irmedServiceRequestGetEnrollmentSummary.go |   6 +-
 ...tEnrollmentSummaryAcknowledgementFilter.go |   4 +-
 ...lmentSummaryAcknowledgementFilterTagged.go |   6 +-
 ...estGetEnrollmentSummaryEventStateFilter.go |   4 +-
 ...EnrollmentSummaryEventStateFilterTagged.go |   6 +-
 ...questGetEnrollmentSummaryPriorityFilter.go |   6 +-
 ...firmedServiceRequestGetEventInformation.go |   6 +-
 ...firmedServiceRequestLifeSafetyOperation.go |   6 +-
 ...CnetConfirmedServiceRequestReadProperty.go |   6 +-
 ...edServiceRequestReadPropertyConditional.go |   6 +-
 ...irmedServiceRequestReadPropertyMultiple.go |   6 +-
 .../BACnetConfirmedServiceRequestReadRange.go |  21 +-
 ...etConfirmedServiceRequestReadRangeRange.go |   6 +-
 ...dServiceRequestReadRangeRangeByPosition.go |   6 +-
 ...ceRequestReadRangeRangeBySequenceNumber.go |   6 +-
 ...irmedServiceRequestReadRangeRangeByTime.go |   6 +-
 ...nfirmedServiceRequestReinitializeDevice.go |   6 +-
 ...tializeDeviceReinitializedStateOfDevice.go |   4 +-
 ...eDeviceReinitializedStateOfDeviceTagged.go |   6 +-
 ...onfirmedServiceRequestRemoveListElement.go |  21 +-
 ...BACnetConfirmedServiceRequestRequestKey.go |   6 +-
 ...CnetConfirmedServiceRequestSubscribeCOV.go |   6 +-
 ...irmedServiceRequestSubscribeCOVProperty.go |   6 +-
 ...viceRequestSubscribeCOVPropertyMultiple.go |   6 +-
 ...ipleListOfCovSubscriptionSpecifications.go |   6 +-
 ...ListOfCovSubscriptionSpecificationsList.go |   6 +-
 ...fCovSubscriptionSpecificationsReference.go |   6 +-
 .../BACnetConfirmedServiceRequestUnknown.go   |   6 +-
 .../BACnetConfirmedServiceRequestVTClose.go   |   6 +-
 .../BACnetConfirmedServiceRequestVTData.go    |   6 +-
 .../BACnetConfirmedServiceRequestVTOpen.go    |   6 +-
 ...netConfirmedServiceRequestWriteProperty.go |  21 +-
 ...rmedServiceRequestWritePropertyMultiple.go |   6 +-
 .../readwrite/model/BACnetConstructedData.go  |   6 +-
 .../model/BACnetConstructedDataAPDULength.go  |   6 +-
 ...BACnetConstructedDataAPDUSegmentTimeout.go |   6 +-
 .../model/BACnetConstructedDataAPDUTimeout.go |   6 +-
 .../BACnetConstructedDataAbsenteeLimit.go     |   6 +-
 .../BACnetConstructedDataAcceptedModes.go     |   6 +-
 .../BACnetConstructedDataAccessAlarmEvents.go |   6 +-
 ...ACnetConstructedDataAccessCredentialAll.go |   4 +-
 ...netConstructedDataAccessDoorAlarmValues.go |   6 +-
 .../BACnetConstructedDataAccessDoorAll.go     |   4 +-
 ...netConstructedDataAccessDoorFaultValues.go |   6 +-
 ...etConstructedDataAccessDoorPresentValue.go |   6 +-
 ...structedDataAccessDoorRelinquishDefault.go |   6 +-
 .../model/BACnetConstructedDataAccessDoors.go |   6 +-
 .../model/BACnetConstructedDataAccessEvent.go |   6 +-
 ...ctedDataAccessEventAuthenticationFactor.go |   6 +-
 ...netConstructedDataAccessEventCredential.go |   6 +-
 .../BACnetConstructedDataAccessEventTag.go    |   6 +-
 .../BACnetConstructedDataAccessEventTime.go   |  21 +-
 .../BACnetConstructedDataAccessPointAll.go    |   4 +-
 .../BACnetConstructedDataAccessRightsAll.go   |   4 +-
 ...tConstructedDataAccessTransactionEvents.go |   6 +-
 .../BACnetConstructedDataAccessUserAll.go     |   4 +-
 ...netConstructedDataAccessZoneAdjustValue.go |   6 +-
 ...netConstructedDataAccessZoneAlarmValues.go |   6 +-
 .../BACnetConstructedDataAccessZoneAll.go     |   4 +-
 .../BACnetConstructedDataAccompaniment.go     |   6 +-
 .../BACnetConstructedDataAccompanimentTime.go |   6 +-
 .../BACnetConstructedDataAccumulatorAll.go    |   4 +-
 ...onstructedDataAccumulatorFaultHighLimit.go |   6 +-
 ...ConstructedDataAccumulatorFaultLowLimit.go |   6 +-
 ...CnetConstructedDataAccumulatorHighLimit.go |   6 +-
 ...ACnetConstructedDataAccumulatorLowLimit.go |   6 +-
 ...tConstructedDataAccumulatorMaxPresValue.go |   6 +-
 ...tConstructedDataAccumulatorMinPresValue.go |   6 +-
 .../model/BACnetConstructedDataAckRequired.go |   6 +-
 .../BACnetConstructedDataAckedTransitions.go  |   6 +-
 .../model/BACnetConstructedDataAction.go      |   6 +-
 .../model/BACnetConstructedDataActionText.go  |   6 +-
 .../BACnetConstructedDataActivationTime.go    |   6 +-
 ...nstructedDataActiveAuthenticationPolicy.go |   6 +-
 ...uctedDataActiveCOVMultipleSubscriptions.go |   6 +-
 ...etConstructedDataActiveCOVSubscriptions.go |   6 +-
 .../model/BACnetConstructedDataActiveText.go  |   6 +-
 .../BACnetConstructedDataActiveVTSessions.go  |   6 +-
 .../BACnetConstructedDataActualShedLevel.go   |  21 +-
 .../model/BACnetConstructedDataAdjustValue.go |   6 +-
 .../model/BACnetConstructedDataAlarmValue.go  |   6 +-
 .../model/BACnetConstructedDataAlarmValues.go |   6 +-
 ...BACnetConstructedDataAlertEnrollmentAll.go |   4 +-
 ...structedDataAlertEnrollmentPresentValue.go |   6 +-
 .../BACnetConstructedDataAlignIntervals.go    |   6 +-
 ...ACnetConstructedDataAllWritesSuccessful.go |   6 +-
 ...etConstructedDataAllowGroupDelayInhibit.go |   6 +-
 .../BACnetConstructedDataAnalogInputAll.go    |   4 +-
 ...onstructedDataAnalogInputFaultHighLimit.go |   6 +-
 ...ConstructedDataAnalogInputFaultLowLimit.go |   6 +-
 ...onstructedDataAnalogInputInterfaceValue.go |  21 +-
 ...tConstructedDataAnalogInputMaxPresValue.go |   6 +-
 ...tConstructedDataAnalogInputPresentValue.go |   6 +-
 .../BACnetConstructedDataAnalogOutputAll.go   |   4 +-
 ...nstructedDataAnalogOutputInterfaceValue.go |  21 +-
 ...ConstructedDataAnalogOutputMaxPresValue.go |   6 +-
 ...ConstructedDataAnalogOutputPresentValue.go |   6 +-
 ...ructedDataAnalogOutputRelinquishDefault.go |   6 +-
 .../BACnetConstructedDataAnalogValueAll.go    |   4 +-
 ...onstructedDataAnalogValueFaultHighLimit.go |   6 +-
 ...ConstructedDataAnalogValueFaultLowLimit.go |   6 +-
 ...tConstructedDataAnalogValueMaxPresValue.go |   6 +-
 ...tConstructedDataAnalogValuePresentValue.go |   6 +-
 ...tructedDataAnalogValueRelinquishDefault.go |   6 +-
 ...nstructedDataApplicationSoftwareVersion.go |   6 +-
 .../model/BACnetConstructedDataArchive.go     |   6 +-
 ...CnetConstructedDataAssignedAccessRights.go |   6 +-
 ...CnetConstructedDataAssignedLandingCalls.go |   6 +-
 .../BACnetConstructedDataAttemptedSamples.go  |   6 +-
 ...netConstructedDataAuthenticationFactors.go |   6 +-
 ...ConstructedDataAuthenticationPolicyList.go |   6 +-
 ...onstructedDataAuthenticationPolicyNames.go |   6 +-
 ...CnetConstructedDataAuthenticationStatus.go |   6 +-
 ...tConstructedDataAuthorizationExemptions.go |   6 +-
 .../BACnetConstructedDataAuthorizationMode.go |   6 +-
 ...BACnetConstructedDataAutoSlaveDiscovery.go |   6 +-
 .../BACnetConstructedDataAverageValue.go      |   6 +-
 .../BACnetConstructedDataAveragingAll.go      |   4 +-
 ...netConstructedDataBACnetIPGlobalAddress.go |   6 +-
 .../BACnetConstructedDataBACnetIPMode.go      |   6 +-
 ...ConstructedDataBACnetIPMulticastAddress.go |   6 +-
 ...CnetConstructedDataBACnetIPNATTraversal.go |   6 +-
 .../BACnetConstructedDataBACnetIPUDPPort.go   |   6 +-
 .../BACnetConstructedDataBACnetIPv6Mode.go    |   6 +-
 ...nstructedDataBACnetIPv6MulticastAddress.go |   6 +-
 .../BACnetConstructedDataBACnetIPv6UDPPort.go |   6 +-
 ...onstructedDataBBMDAcceptFDRegistrations.go |   6 +-
 ...uctedDataBBMDBroadcastDistributionTable.go |   6 +-
 ...etConstructedDataBBMDForeignDeviceTable.go |   6 +-
 ...netConstructedDataBackupAndRestoreState.go |   6 +-
 ...CnetConstructedDataBackupFailureTimeout.go |   6 +-
 ...netConstructedDataBackupPreparationTime.go |   6 +-
 ...ConstructedDataBaseDeviceSecurityPolicy.go |   6 +-
 .../model/BACnetConstructedDataBelongsTo.go   |   6 +-
 .../model/BACnetConstructedDataBias.go        |   6 +-
 .../BACnetConstructedDataBinaryInputAll.go    |   4 +-
 ...onstructedDataBinaryInputInterfaceValue.go |  21 +-
 ...tConstructedDataBinaryInputPresentValue.go |   6 +-
 ...tConstructedDataBinaryLightingOutputAll.go |   4 +-
 ...edDataBinaryLightingOutputFeedbackValue.go |   6 +-
 ...tedDataBinaryLightingOutputPresentValue.go |   6 +-
 ...taBinaryLightingOutputRelinquishDefault.go |   6 +-
 .../BACnetConstructedDataBinaryOutputAll.go   |   4 +-
 ...onstructedDataBinaryOutputFeedbackValue.go |   6 +-
 ...nstructedDataBinaryOutputInterfaceValue.go |  21 +-
 ...ConstructedDataBinaryOutputPresentValue.go |   6 +-
 ...ructedDataBinaryOutputRelinquishDefault.go |   6 +-
 .../BACnetConstructedDataBinaryValueAll.go    |   4 +-
 ...tConstructedDataBinaryValuePresentValue.go |   6 +-
 ...tructedDataBinaryValueRelinquishDefault.go |   6 +-
 .../model/BACnetConstructedDataBitMask.go     |   6 +-
 ...onstructedDataBitStringValueAlarmValues.go |   6 +-
 ...nstructedDataBitStringValuePresentValue.go |   6 +-
 ...ctedDataBitStringValueRelinquishDefault.go |   6 +-
 .../model/BACnetConstructedDataBitText.go     |   6 +-
 .../BACnetConstructedDataBitstringValueAll.go |   4 +-
 .../BACnetConstructedDataBlinkWarnEnable.go   |   6 +-
 .../model/BACnetConstructedDataBufferSize.go  |   6 +-
 .../BACnetConstructedDataCOVIncrement.go      |   6 +-
 .../model/BACnetConstructedDataCOVPeriod.go   |   6 +-
 ...onstructedDataCOVResubscriptionInterval.go |   6 +-
 .../model/BACnetConstructedDataCOVUPeriod.go  |   6 +-
 .../BACnetConstructedDataCOVURecipients.go    |   6 +-
 .../model/BACnetConstructedDataCalendarAll.go |   4 +-
 ...CnetConstructedDataCalendarPresentValue.go |   6 +-
 ...CnetConstructedDataCarAssignedDirection.go |   6 +-
 .../BACnetConstructedDataCarDoorCommand.go    |   6 +-
 .../BACnetConstructedDataCarDoorStatus.go     |   6 +-
 .../model/BACnetConstructedDataCarDoorText.go |   6 +-
 .../model/BACnetConstructedDataCarDoorZone.go |   6 +-
 .../BACnetConstructedDataCarDriveStatus.go    |   6 +-
 .../model/BACnetConstructedDataCarLoad.go     |   6 +-
 .../BACnetConstructedDataCarLoadUnits.go      |   6 +-
 .../model/BACnetConstructedDataCarMode.go     |   6 +-
 ...BACnetConstructedDataCarMovingDirection.go |   6 +-
 .../model/BACnetConstructedDataCarPosition.go |   6 +-
 ...BACnetConstructedDataChangeOfStateCount.go |   6 +-
 .../BACnetConstructedDataChangeOfStateTime.go |   6 +-
 .../BACnetConstructedDataChangesPending.go    |   6 +-
 .../model/BACnetConstructedDataChannelAll.go  |   4 +-
 ...taChannelListOfObjectPropertyReferences.go |   6 +-
 .../BACnetConstructedDataChannelNumber.go     |   6 +-
 ...ACnetConstructedDataChannelPresentValue.go |  21 +-
 ...ctedDataCharacterStringValueAlarmValues.go |   6 +-
 ...ctedDataCharacterStringValueFaultValues.go |   6 +-
 ...tedDataCharacterStringValuePresentValue.go |   6 +-
 ...taCharacterStringValueRelinquishDefault.go |   6 +-
 ...tConstructedDataCharacterstringValueAll.go |   4 +-
 ...BACnetConstructedDataClientCOVIncrement.go |  21 +-
 .../model/BACnetConstructedDataCommand.go     |   6 +-
 .../BACnetConstructedDataCommandAction.go     |   6 +-
 .../model/BACnetConstructedDataCommandAll.go  |   4 +-
 .../BACnetConstructedDataCommandTimeArray.go  |   6 +-
 ...BACnetConstructedDataConfigurationFiles.go |   6 +-
 .../BACnetConstructedDataControlGroups.go     |   6 +-
 ...structedDataControlledVariableReference.go |   6 +-
 ...tConstructedDataControlledVariableUnits.go |   6 +-
 ...tConstructedDataControlledVariableValue.go |   6 +-
 .../model/BACnetConstructedDataCount.go       |   6 +-
 .../BACnetConstructedDataCountBeforeChange.go |   6 +-
 .../BACnetConstructedDataCountChangeTime.go   |   6 +-
 ...etConstructedDataCredentialDataInputAll.go |   4 +-
 ...ctedDataCredentialDataInputPresentValue.go |   6 +-
 ...ructedDataCredentialDataInputUpdateTime.go |  21 +-
 .../BACnetConstructedDataCredentialDisable.go |   6 +-
 .../BACnetConstructedDataCredentialStatus.go  |   6 +-
 .../model/BACnetConstructedDataCredentials.go |   6 +-
 .../BACnetConstructedDataCredentialsInZone.go |   6 +-
 ...etConstructedDataCurrentCommandPriority.go |  21 +-
 .../BACnetConstructedDataDatabaseRevision.go  |   6 +-
 .../model/BACnetConstructedDataDateList.go    |   6 +-
 ...tructedDataDatePatternValuePresentValue.go |   6 +-
 ...edDataDatePatternValueRelinquishDefault.go |   6 +-
 ...tedDataDateTimePatternValuePresentValue.go |   6 +-
 ...taDateTimePatternValueRelinquishDefault.go |   6 +-
 ...onstructedDataDateTimeValuePresentValue.go |   6 +-
 ...uctedDataDateTimeValueRelinquishDefault.go |   6 +-
 .../BACnetConstructedDataDateValueAll.go      |   4 +-
 ...netConstructedDataDateValuePresentValue.go |   6 +-
 ...nstructedDataDateValueRelinquishDefault.go |   6 +-
 ...ACnetConstructedDataDatepatternValueAll.go |   4 +-
 .../BACnetConstructedDataDatetimeValueAll.go  |   4 +-
 ...tConstructedDataDatetimepatternValueAll.go |   4 +-
 ...netConstructedDataDaylightSavingsStatus.go |   6 +-
 .../BACnetConstructedDataDaysRemaining.go     |   6 +-
 .../model/BACnetConstructedDataDeadband.go    |   6 +-
 .../BACnetConstructedDataDefaultFadeTime.go   |   6 +-
 .../BACnetConstructedDataDefaultRampRate.go   |   6 +-
 ...CnetConstructedDataDefaultStepIncrement.go |   6 +-
 ...uctedDataDefaultSubordinateRelationship.go |   6 +-
 .../BACnetConstructedDataDefaultTimeout.go    |   6 +-
 ...tConstructedDataDeployedProfileLocation.go |   6 +-
 ...BACnetConstructedDataDerivativeConstant.go |   6 +-
 ...tConstructedDataDerivativeConstantUnits.go |   6 +-
 .../model/BACnetConstructedDataDescription.go |   6 +-
 .../BACnetConstructedDataDescriptionOfHalt.go |   6 +-
 ...CnetConstructedDataDeviceAddressBinding.go |   6 +-
 .../model/BACnetConstructedDataDeviceAll.go   |   4 +-
 ...ACnetConstructedDataDeviceMaxInfoFrames.go |   6 +-
 .../BACnetConstructedDataDeviceMaxMaster.go   |   6 +-
 .../model/BACnetConstructedDataDeviceType.go  |   6 +-
 .../BACnetConstructedDataDirectReading.go     |   6 +-
 ...tConstructedDataDistributionKeyRevision.go |   6 +-
 .../model/BACnetConstructedDataDoNotHide.go   |   6 +-
 .../BACnetConstructedDataDoorAlarmState.go    |   6 +-
 ...netConstructedDataDoorExtendedPulseTime.go |   6 +-
 .../model/BACnetConstructedDataDoorMembers.go |   6 +-
 ...ACnetConstructedDataDoorOpenTooLongTime.go |   6 +-
 .../BACnetConstructedDataDoorPulseTime.go     |   6 +-
 .../model/BACnetConstructedDataDoorStatus.go  |   6 +-
 ...ACnetConstructedDataDoorUnlockDelayTime.go |   6 +-
 .../model/BACnetConstructedDataDutyWindow.go  |   6 +-
 .../BACnetConstructedDataEffectivePeriod.go   |   6 +-
 .../BACnetConstructedDataEgressActive.go      |   6 +-
 .../model/BACnetConstructedDataEgressTime.go  |   6 +-
 .../BACnetConstructedDataElapsedActiveTime.go |   6 +-
 .../model/BACnetConstructedDataElement.go     |  51 +-
 .../BACnetConstructedDataElevatorGroup.go     |   6 +-
 .../BACnetConstructedDataElevatorGroupAll.go  |   4 +-
 ...onstructedDataElevatorGroupGroupMembers.go |   6 +-
 .../model/BACnetConstructedDataEnable.go      |   6 +-
 .../model/BACnetConstructedDataEnergyMeter.go |   6 +-
 .../BACnetConstructedDataEnergyMeterRef.go    |   6 +-
 .../model/BACnetConstructedDataEntryPoints.go |   6 +-
 .../model/BACnetConstructedDataErrorLimit.go  |   6 +-
 .../BACnetConstructedDataEscalatorAll.go      |   4 +-
 ...netConstructedDataEscalatorFaultSignals.go |   6 +-
 .../BACnetConstructedDataEscalatorMode.go     |   6 +-
 ...netConstructedDataEventAlgorithmInhibit.go |   6 +-
 ...ConstructedDataEventAlgorithmInhibitRef.go |   6 +-
 ...CnetConstructedDataEventDetectionEnable.go |   6 +-
 .../model/BACnetConstructedDataEventEnable.go |   6 +-
 ...BACnetConstructedDataEventEnrollmentAll.go |   4 +-
 .../model/BACnetConstructedDataEventLogAll.go |   4 +-
 .../BACnetConstructedDataEventLogLogBuffer.go |   6 +-
 .../BACnetConstructedDataEventMessageTexts.go |   6 +-
 ...tConstructedDataEventMessageTextsConfig.go |   6 +-
 .../BACnetConstructedDataEventParameters.go   |  21 +-
 .../model/BACnetConstructedDataEventState.go  |   6 +-
 .../BACnetConstructedDataEventTimeStamps.go   |   6 +-
 .../model/BACnetConstructedDataEventType.go   |   6 +-
 .../BACnetConstructedDataExceptionSchedule.go |   6 +-
 .../BACnetConstructedDataExecutionDelay.go    |   6 +-
 .../model/BACnetConstructedDataExitPoints.go  |   6 +-
 .../BACnetConstructedDataExpectedShedLevel.go |  21 +-
 .../BACnetConstructedDataExpirationTime.go    |   6 +-
 ...BACnetConstructedDataExtendedTimeEnable.go |   6 +-
 .../BACnetConstructedDataFDBBMDAddress.go     |   6 +-
 ...etConstructedDataFDSubscriptionLifetime.go |   6 +-
 ...ACnetConstructedDataFailedAttemptEvents.go |   6 +-
 .../BACnetConstructedDataFailedAttempts.go    |   6 +-
 ...BACnetConstructedDataFailedAttemptsTime.go |   6 +-
 .../BACnetConstructedDataFaultHighLimit.go    |   6 +-
 .../BACnetConstructedDataFaultLowLimit.go     |   6 +-
 .../BACnetConstructedDataFaultParameters.go   |  21 +-
 .../BACnetConstructedDataFaultSignals.go      |   6 +-
 .../model/BACnetConstructedDataFaultType.go   |   6 +-
 .../model/BACnetConstructedDataFaultValues.go |   6 +-
 .../BACnetConstructedDataFileAccessMethod.go  |   6 +-
 .../model/BACnetConstructedDataFileAll.go     |   4 +-
 .../BACnetConstructedDataFileRecordCount.go   |   6 +-
 .../model/BACnetConstructedDataFileSize.go    |   6 +-
 .../model/BACnetConstructedDataFileType.go    |   6 +-
 .../BACnetConstructedDataFirmwareRevision.go  |   6 +-
 .../model/BACnetConstructedDataFloorText.go   |   6 +-
 .../BACnetConstructedDataFullDutyBaseline.go  |   6 +-
 .../BACnetConstructedDataGlobalGroupAll.go    |   4 +-
 ...tConstructedDataGlobalGroupGroupMembers.go |   6 +-
 ...tConstructedDataGlobalGroupPresentValue.go |   6 +-
 .../BACnetConstructedDataGlobalIdentifier.go  |   6 +-
 .../model/BACnetConstructedDataGroupAll.go    |   4 +-
 .../model/BACnetConstructedDataGroupID.go     |   6 +-
 .../BACnetConstructedDataGroupMemberNames.go  |   6 +-
 .../BACnetConstructedDataGroupMembers.go      |   6 +-
 .../model/BACnetConstructedDataGroupMode.go   |   6 +-
 .../BACnetConstructedDataGroupPresentValue.go |   6 +-
 .../model/BACnetConstructedDataHighLimit.go   |   6 +-
 .../model/BACnetConstructedDataHigherDeck.go  |   6 +-
 .../model/BACnetConstructedDataIPAddress.go   |   6 +-
 .../BACnetConstructedDataIPDHCPEnable.go      |   6 +-
 .../BACnetConstructedDataIPDHCPLeaseTime.go   |   6 +-
 ...ConstructedDataIPDHCPLeaseTimeRemaining.go |   6 +-
 .../BACnetConstructedDataIPDHCPServer.go      |   6 +-
 .../model/BACnetConstructedDataIPDNSServer.go |   6 +-
 .../BACnetConstructedDataIPDefaultGateway.go  |   6 +-
 .../BACnetConstructedDataIPSubnetMask.go      |   6 +-
 .../model/BACnetConstructedDataIPv6Address.go |   6 +-
 ...ConstructedDataIPv6AutoAddressingEnable.go |   6 +-
 .../BACnetConstructedDataIPv6DHCPLeaseTime.go |   6 +-
 ...nstructedDataIPv6DHCPLeaseTimeRemaining.go |   6 +-
 .../BACnetConstructedDataIPv6DHCPServer.go    |   6 +-
 .../BACnetConstructedDataIPv6DNSServer.go     |   6 +-
 ...BACnetConstructedDataIPv6DefaultGateway.go |   6 +-
 .../BACnetConstructedDataIPv6PrefixLength.go  |   6 +-
 .../BACnetConstructedDataIPv6ZoneIndex.go     |   6 +-
 .../model/BACnetConstructedDataInProcess.go   |   6 +-
 .../model/BACnetConstructedDataInProgress.go  |   6 +-
 .../BACnetConstructedDataInactiveText.go      |   6 +-
 .../BACnetConstructedDataInitialTimeout.go    |   6 +-
 .../BACnetConstructedDataInputReference.go    |   6 +-
 .../BACnetConstructedDataInstallationID.go    |   6 +-
 .../model/BACnetConstructedDataInstanceOf.go  |   6 +-
 ...BACnetConstructedDataInstantaneousPower.go |   6 +-
 .../BACnetConstructedDataIntegerValueAll.go   |   4 +-
 ...ConstructedDataIntegerValueCOVIncrement.go |   6 +-
 ...CnetConstructedDataIntegerValueDeadband.go |   6 +-
 ...nstructedDataIntegerValueFaultHighLimit.go |   6 +-
 ...onstructedDataIntegerValueFaultLowLimit.go |   6 +-
 ...netConstructedDataIntegerValueHighLimit.go |   6 +-
 ...CnetConstructedDataIntegerValueLowLimit.go |   6 +-
 ...ConstructedDataIntegerValueMaxPresValue.go |   6 +-
 ...ConstructedDataIntegerValueMinPresValue.go |   6 +-
 ...ConstructedDataIntegerValuePresentValue.go |   6 +-
 ...ructedDataIntegerValueRelinquishDefault.go |   6 +-
 ...etConstructedDataIntegerValueResolution.go |   6 +-
 .../BACnetConstructedDataIntegralConstant.go  |   6 +-
 ...netConstructedDataIntegralConstantUnits.go |   6 +-
 .../BACnetConstructedDataIntervalOffset.go    |   6 +-
 .../model/BACnetConstructedDataIsUTC.go       |   6 +-
 .../model/BACnetConstructedDataKeySets.go     |   6 +-
 ...BACnetConstructedDataLandingCallControl.go |   6 +-
 .../BACnetConstructedDataLandingCalls.go      |   6 +-
 .../BACnetConstructedDataLandingDoorStatus.go |   6 +-
 ...ACnetConstructedDataLargeAnalogValueAll.go |   4 +-
 ...tructedDataLargeAnalogValueCOVIncrement.go |   6 +-
 ...ConstructedDataLargeAnalogValueDeadband.go |   6 +-
 ...uctedDataLargeAnalogValueFaultHighLimit.go |   6 +-
 ...ructedDataLargeAnalogValueFaultLowLimit.go |   6 +-
 ...onstructedDataLargeAnalogValueHighLimit.go |   6 +-
 ...ConstructedDataLargeAnalogValueLowLimit.go |   6 +-
 ...tructedDataLargeAnalogValueMaxPresValue.go |   6 +-
 ...tructedDataLargeAnalogValueMinPresValue.go |   6 +-
 ...tructedDataLargeAnalogValuePresentValue.go |   6 +-
 ...edDataLargeAnalogValueRelinquishDefault.go |   6 +-
 ...nstructedDataLargeAnalogValueResolution.go |   6 +-
 .../BACnetConstructedDataLastAccessEvent.go   |   6 +-
 .../BACnetConstructedDataLastAccessPoint.go   |   6 +-
 .../BACnetConstructedDataLastCommandTime.go   |  21 +-
 ...ACnetConstructedDataLastCredentialAdded.go |   6 +-
 ...tConstructedDataLastCredentialAddedTime.go |   6 +-
 ...netConstructedDataLastCredentialRemoved.go |   6 +-
 ...onstructedDataLastCredentialRemovedTime.go |   6 +-
 .../BACnetConstructedDataLastKeyServer.go     |   6 +-
 .../BACnetConstructedDataLastNotifyRecord.go  |   6 +-
 .../BACnetConstructedDataLastPriority.go      |   6 +-
 .../BACnetConstructedDataLastRestartReason.go |   6 +-
 .../BACnetConstructedDataLastRestoreTime.go   |  21 +-
 .../BACnetConstructedDataLastStateChange.go   |   6 +-
 .../model/BACnetConstructedDataLastUseTime.go |   6 +-
 ...netConstructedDataLifeSafetyAlarmValues.go |   6 +-
 ...nstructedDataLifeSafetyPointAlarmValues.go |   6 +-
 ...BACnetConstructedDataLifeSafetyPointAll.go |   4 +-
 ...nstructedDataLifeSafetyPointFaultValues.go |   6 +-
 ...structedDataLifeSafetyPointPresentValue.go |   6 +-
 ...onstructedDataLifeSafetyZoneAlarmValues.go |   6 +-
 .../BACnetConstructedDataLifeSafetyZoneAll.go |   4 +-
 ...onstructedDataLifeSafetyZoneFaultValues.go |   6 +-
 ...edDataLifeSafetyZoneMaintenanceRequired.go |   6 +-
 ...nstructedDataLifeSafetyZonePresentValue.go |   6 +-
 .../model/BACnetConstructedDataLiftAll.go     |   4 +-
 .../BACnetConstructedDataLiftFaultSignals.go  |   6 +-
 .../BACnetConstructedDataLightingCommand.go   |   6 +-
 ...uctedDataLightingCommandDefaultPriority.go |   6 +-
 .../BACnetConstructedDataLightingOutputAll.go |   4 +-
 ...structedDataLightingOutputFeedbackValue.go |   6 +-
 ...nstructedDataLightingOutputPresentValue.go |   6 +-
 ...ctedDataLightingOutputRelinquishDefault.go |   6 +-
 ...structedDataLightingOutputTrackingValue.go |   6 +-
 .../model/BACnetConstructedDataLimitEnable.go |   6 +-
 ...tConstructedDataLimitMonitoringInterval.go |   6 +-
 .../model/BACnetConstructedDataLinkSpeed.go   |   6 +-
 ...etConstructedDataLinkSpeedAutonegotiate.go |   6 +-
 .../model/BACnetConstructedDataLinkSpeeds.go  |   6 +-
 ...BACnetConstructedDataListOfGroupMembers.go |   6 +-
 ...uctedDataListOfObjectPropertyReferences.go |   6 +-
 .../BACnetConstructedDataLoadControlAll.go    |   4 +-
 ...tConstructedDataLoadControlPresentValue.go |   6 +-
 .../model/BACnetConstructedDataLocalDate.go   |   6 +-
 ...ACnetConstructedDataLocalForwardingOnly.go |   6 +-
 .../model/BACnetConstructedDataLocalTime.go   |   6 +-
 .../model/BACnetConstructedDataLocation.go    |   6 +-
 .../model/BACnetConstructedDataLockStatus.go  |   6 +-
 .../model/BACnetConstructedDataLockout.go     |   6 +-
 ...netConstructedDataLockoutRelinquishTime.go |   6 +-
 .../model/BACnetConstructedDataLogBuffer.go   |   6 +-
 ...tConstructedDataLogDeviceObjectProperty.go |   6 +-
 .../model/BACnetConstructedDataLogInterval.go |   6 +-
 .../BACnetConstructedDataLoggingObject.go     |   6 +-
 .../BACnetConstructedDataLoggingRecord.go     |   6 +-
 .../model/BACnetConstructedDataLoggingType.go |   6 +-
 .../model/BACnetConstructedDataLoopAction.go  |   6 +-
 .../model/BACnetConstructedDataLoopAll.go     |   4 +-
 .../BACnetConstructedDataLoopPresentValue.go  |   6 +-
 .../BACnetConstructedDataLowDiffLimit.go      |  21 +-
 .../model/BACnetConstructedDataLowLimit.go    |   6 +-
 .../model/BACnetConstructedDataLowerDeck.go   |   6 +-
 .../model/BACnetConstructedDataMACAddress.go  |   6 +-
 .../BACnetConstructedDataMachineRoomID.go     |   6 +-
 ...ACnetConstructedDataMaintenanceRequired.go |   6 +-
 .../BACnetConstructedDataMakingCarCall.go     |   6 +-
 ...tructedDataManipulatedVariableReference.go |   6 +-
 ...onstructedDataManualSlaveAddressBinding.go |   6 +-
 .../BACnetConstructedDataMaskedAlarmValues.go |   6 +-
 ...netConstructedDataMaxAPDULengthAccepted.go |   6 +-
 .../BACnetConstructedDataMaxActualValue.go    |   6 +-
 .../BACnetConstructedDataMaxFailedAttempts.go |   6 +-
 .../BACnetConstructedDataMaxInfoFrames.go     |   6 +-
 .../model/BACnetConstructedDataMaxMaster.go   |   6 +-
 .../BACnetConstructedDataMaxPresValue.go      |   6 +-
 ...ACnetConstructedDataMaxSegmentsAccepted.go |   6 +-
 .../BACnetConstructedDataMaximumOutput.go     |   6 +-
 .../BACnetConstructedDataMaximumValue.go      |   6 +-
 ...netConstructedDataMaximumValueTimestamp.go |   6 +-
 .../model/BACnetConstructedDataMemberOf.go    |   6 +-
 .../BACnetConstructedDataMemberStatusFlags.go |   6 +-
 .../model/BACnetConstructedDataMembers.go     |   6 +-
 .../BACnetConstructedDataMinActualValue.go    |   6 +-
 .../BACnetConstructedDataMinPresValue.go      |   6 +-
 .../BACnetConstructedDataMinimumOffTime.go    |   6 +-
 .../BACnetConstructedDataMinimumOnTime.go     |   6 +-
 .../BACnetConstructedDataMinimumOutput.go     |   6 +-
 .../BACnetConstructedDataMinimumValue.go      |   6 +-
 ...netConstructedDataMinimumValueTimestamp.go |   6 +-
 .../model/BACnetConstructedDataMode.go        |   6 +-
 .../model/BACnetConstructedDataModelName.go   |   6 +-
 .../BACnetConstructedDataModificationDate.go  |   6 +-
 ...nstructedDataMultiStateInputAlarmValues.go |   6 +-
 ...BACnetConstructedDataMultiStateInputAll.go |   4 +-
 ...nstructedDataMultiStateInputFaultValues.go |   6 +-
 ...ructedDataMultiStateInputInterfaceValue.go |  21 +-
 ...ACnetConstructedDataMultiStateOutputAll.go |   4 +-
 ...ructedDataMultiStateOutputFeedbackValue.go |   6 +-
 ...uctedDataMultiStateOutputInterfaceValue.go |  21 +-
 ...edDataMultiStateOutputRelinquishDefault.go |   6 +-
 ...nstructedDataMultiStateValueAlarmValues.go |   6 +-
 ...BACnetConstructedDataMultiStateValueAll.go |   4 +-
 ...nstructedDataMultiStateValueFaultValues.go |   6 +-
 ...tedDataMultiStateValueRelinquishDefault.go |   6 +-
 .../model/BACnetConstructedDataMusterPoint.go |   6 +-
 ...ACnetConstructedDataNegativeAccessRules.go |   6 +-
 ...ructedDataNetworkAccessSecurityPolicies.go |   6 +-
 ...CnetConstructedDataNetworkInterfaceName.go |   6 +-
 .../BACnetConstructedDataNetworkNumber.go     |   6 +-
 ...CnetConstructedDataNetworkNumberQuality.go |   6 +-
 .../BACnetConstructedDataNetworkPortAll.go    |   4 +-
 ...ConstructedDataNetworkPortMaxInfoFrames.go |   6 +-
 ...CnetConstructedDataNetworkPortMaxMaster.go |   6 +-
 ...BACnetConstructedDataNetworkSecurityAll.go |   4 +-
 .../model/BACnetConstructedDataNetworkType.go |   6 +-
 .../BACnetConstructedDataNextStoppingFloor.go |   6 +-
 .../model/BACnetConstructedDataNodeSubtype.go |   6 +-
 .../model/BACnetConstructedDataNodeType.go    |   6 +-
 .../BACnetConstructedDataNotificationClass.go |   6 +-
 ...CnetConstructedDataNotificationClassAll.go |   4 +-
 ...ConstructedDataNotificationForwarderAll.go |   4 +-
 ...netConstructedDataNotificationThreshold.go |   6 +-
 .../model/BACnetConstructedDataNotifyType.go  |   6 +-
 ...ACnetConstructedDataNumberOfAPDURetries.go |   6 +-
 ...uctedDataNumberOfAuthenticationPolicies.go |   6 +-
 .../BACnetConstructedDataNumberOfStates.go    |   6 +-
 .../BACnetConstructedDataObjectIdentifier.go  |   6 +-
 .../model/BACnetConstructedDataObjectList.go  |   6 +-
 .../model/BACnetConstructedDataObjectName.go  |   6 +-
 ...tConstructedDataObjectPropertyReference.go |   6 +-
 .../model/BACnetConstructedDataObjectType.go  |   6 +-
 .../BACnetConstructedDataOccupancyCount.go    |   6 +-
 ...CnetConstructedDataOccupancyCountAdjust.go |   6 +-
 ...CnetConstructedDataOccupancyCountEnable.go |   6 +-
 ...ACnetConstructedDataOccupancyLowerLimit.go |   6 +-
 ...structedDataOccupancyLowerLimitEnforced.go |   6 +-
 .../BACnetConstructedDataOccupancyState.go    |   6 +-
 ...ACnetConstructedDataOccupancyUpperLimit.go |   6 +-
 ...structedDataOccupancyUpperLimitEnforced.go |   6 +-
 ...tructedDataOctetStringValuePresentValue.go |   6 +-
 ...edDataOctetStringValueRelinquishDefault.go |   6 +-
 ...ACnetConstructedDataOctetstringValueAll.go |   4 +-
 ...BACnetConstructedDataOperationDirection.go |   6 +-
 .../BACnetConstructedDataOperationExpected.go |   6 +-
 .../model/BACnetConstructedDataOptional.go    |   4 +-
 .../BACnetConstructedDataOutOfService.go      |   6 +-
 .../model/BACnetConstructedDataOutputUnits.go |   6 +-
 .../BACnetConstructedDataPacketReorderTime.go |   6 +-
 .../BACnetConstructedDataPassbackMode.go      |   6 +-
 .../BACnetConstructedDataPassbackTimeout.go   |   6 +-
 .../BACnetConstructedDataPassengerAlarm.go    |   6 +-
 .../model/BACnetConstructedDataPolarity.go    |   6 +-
 .../model/BACnetConstructedDataPortFilter.go  |   6 +-
 ...ACnetConstructedDataPositiveAccessRules.go |   6 +-
 ...tConstructedDataPositiveIntegerValueAll.go |   4 +-
 ...tedDataPositiveIntegerValueCOVIncrement.go |   6 +-
 ...tructedDataPositiveIntegerValueDeadband.go |   6 +-
 ...dDataPositiveIntegerValueFaultHighLimit.go |   6 +-
 ...edDataPositiveIntegerValueFaultLowLimit.go |   6 +-
 ...ructedDataPositiveIntegerValueHighLimit.go |   6 +-
 ...tructedDataPositiveIntegerValueLowLimit.go |   6 +-
 ...tedDataPositiveIntegerValueMaxPresValue.go |   6 +-
 ...tedDataPositiveIntegerValueMinPresValue.go |   6 +-
 ...taPositiveIntegerValueRelinquishDefault.go |   6 +-
 ...uctedDataPositiveIntegerValueResolution.go |   6 +-
 .../model/BACnetConstructedDataPower.go       |   6 +-
 .../model/BACnetConstructedDataPowerMode.go   |   6 +-
 .../model/BACnetConstructedDataPrescale.go    |   6 +-
 .../BACnetConstructedDataPresentValue.go      |   6 +-
 .../model/BACnetConstructedDataPriority.go    |   6 +-
 .../BACnetConstructedDataPriorityArray.go     |   6 +-
 ...BACnetConstructedDataPriorityForWriting.go |   6 +-
 .../BACnetConstructedDataProcessIdentifier.go |   6 +-
 ...tConstructedDataProcessIdentifierFilter.go |  21 +-
 .../BACnetConstructedDataProfileLocation.go   |   6 +-
 .../model/BACnetConstructedDataProfileName.go |   6 +-
 .../model/BACnetConstructedDataProgramAll.go  |   4 +-
 .../BACnetConstructedDataProgramChange.go     |   6 +-
 .../BACnetConstructedDataProgramLocation.go   |   6 +-
 .../BACnetConstructedDataProgramState.go      |   6 +-
 .../BACnetConstructedDataPropertyList.go      |   6 +-
 ...CnetConstructedDataProportionalConstant.go |   6 +-
 ...onstructedDataProportionalConstantUnits.go |   6 +-
 .../BACnetConstructedDataProtocolLevel.go     |   6 +-
 ...tructedDataProtocolObjectTypesSupported.go |   6 +-
 .../BACnetConstructedDataProtocolRevision.go  |   6 +-
 ...onstructedDataProtocolServicesSupported.go |   6 +-
 .../BACnetConstructedDataProtocolVersion.go   |   6 +-
 ...onstructedDataPulseConverterAdjustValue.go |   6 +-
 .../BACnetConstructedDataPulseConverterAll.go |   4 +-
 ...nstructedDataPulseConverterPresentValue.go |   6 +-
 .../model/BACnetConstructedDataPulseRate.go   |   6 +-
 .../model/BACnetConstructedDataReadOnly.go    |   6 +-
 .../BACnetConstructedDataReasonForDisable.go  |   6 +-
 .../BACnetConstructedDataReasonForHalt.go     |   6 +-
 .../BACnetConstructedDataRecipientList.go     |   6 +-
 .../model/BACnetConstructedDataRecordCount.go |   6 +-
 ...ConstructedDataRecordsSinceNotification.go |   6 +-
 .../BACnetConstructedDataReferencePort.go     |   6 +-
 .../BACnetConstructedDataRegisteredCarCall.go |   6 +-
 .../model/BACnetConstructedDataReliability.go |   6 +-
 ...tructedDataReliabilityEvaluationInhibit.go |   6 +-
 .../BACnetConstructedDataRelinquishDefault.go |   6 +-
 .../model/BACnetConstructedDataRepresents.go  |   6 +-
 ...BACnetConstructedDataRequestedShedLevel.go |  21 +-
 ...tConstructedDataRequestedUpdateInterval.go |   6 +-
 .../model/BACnetConstructedDataRequired.go    |   4 +-
 .../model/BACnetConstructedDataResolution.go  |   6 +-
 ...ructedDataRestartNotificationRecipients.go |   6 +-
 ...netConstructedDataRestoreCompletionTime.go |   6 +-
 ...etConstructedDataRestorePreparationTime.go |   6 +-
 .../BACnetConstructedDataRoutingTable.go      |   6 +-
 .../model/BACnetConstructedDataScale.go       |  21 +-
 .../model/BACnetConstructedDataScaleFactor.go |   6 +-
 .../model/BACnetConstructedDataScheduleAll.go |   4 +-
 .../BACnetConstructedDataScheduleDefault.go   |   6 +-
 ...CnetConstructedDataSchedulePresentValue.go |   6 +-
 .../BACnetConstructedDataSecuredStatus.go     |   6 +-
 ...BACnetConstructedDataSecurityPDUTimeout.go |   6 +-
 ...BACnetConstructedDataSecurityTimeWindow.go |   6 +-
 ...netConstructedDataSegmentationSupported.go |   6 +-
 .../BACnetConstructedDataSerialNumber.go      |   6 +-
 .../model/BACnetConstructedDataSetpoint.go    |   6 +-
 .../BACnetConstructedDataSetpointReference.go |   6 +-
 .../model/BACnetConstructedDataSetting.go     |   6 +-
 .../BACnetConstructedDataShedDuration.go      |   6 +-
 ...netConstructedDataShedLevelDescriptions.go |   6 +-
 .../model/BACnetConstructedDataShedLevels.go  |   6 +-
 .../model/BACnetConstructedDataSilenced.go    |   6 +-
 ...ACnetConstructedDataSlaveAddressBinding.go |   6 +-
 .../BACnetConstructedDataSlaveProxyEnable.go  |   6 +-
 .../model/BACnetConstructedDataStartTime.go   |   6 +-
 .../BACnetConstructedDataStateChangeValues.go |   6 +-
 .../BACnetConstructedDataStateDescription.go  |   6 +-
 .../model/BACnetConstructedDataStateText.go   |   6 +-
 .../model/BACnetConstructedDataStatusFlags.go |   6 +-
 .../model/BACnetConstructedDataStopTime.go    |   6 +-
 .../BACnetConstructedDataStopWhenFull.go      |   6 +-
 .../model/BACnetConstructedDataStrikeCount.go |   6 +-
 ...CnetConstructedDataStructuredObjectList.go |   6 +-
 .../BACnetConstructedDataStructuredViewAll.go |   4 +-
 ...etConstructedDataSubordinateAnnotations.go |   6 +-
 .../BACnetConstructedDataSubordinateList.go   |   6 +-
 ...CnetConstructedDataSubordinateNodeTypes.go |   6 +-
 ...ConstructedDataSubordinateRelationships.go |   6 +-
 .../BACnetConstructedDataSubordinateTags.go   |   6 +-
 ...CnetConstructedDataSubscribedRecipients.go |   6 +-
 ...etConstructedDataSupportedFormatClasses.go |   6 +-
 .../BACnetConstructedDataSupportedFormats.go  |   6 +-
 ...structedDataSupportedSecurityAlgorithms.go |   6 +-
 .../BACnetConstructedDataSystemStatus.go      |   6 +-
 .../model/BACnetConstructedDataTags.go        |   6 +-
 .../BACnetConstructedDataThreatAuthority.go   |   6 +-
 .../model/BACnetConstructedDataThreatLevel.go |   6 +-
 .../model/BACnetConstructedDataTimeDelay.go   |   6 +-
 .../BACnetConstructedDataTimeDelayNormal.go   |   6 +-
 ...netConstructedDataTimeOfActiveTimeReset.go |   6 +-
 ...ACnetConstructedDataTimeOfDeviceRestart.go |  21 +-
 ...netConstructedDataTimeOfStateCountReset.go |   6 +-
 ...etConstructedDataTimeOfStrikeCountReset.go |   6 +-
 ...tructedDataTimePatternValuePresentValue.go |   6 +-
 ...edDataTimePatternValueRelinquishDefault.go |   6 +-
 ...structedDataTimeSynchronizationInterval.go |   6 +-
 ...ructedDataTimeSynchronizationRecipients.go |   6 +-
 .../BACnetConstructedDataTimeValueAll.go      |   4 +-
 ...netConstructedDataTimeValuePresentValue.go |   6 +-
 ...nstructedDataTimeValueRelinquishDefault.go |   6 +-
 ...ACnetConstructedDataTimepatternValueAll.go |   4 +-
 .../BACnetConstructedDataTimerAlarmValues.go  |   6 +-
 .../model/BACnetConstructedDataTimerAll.go    |   4 +-
 .../BACnetConstructedDataTimerMaxPresValue.go |   6 +-
 .../BACnetConstructedDataTimerMinPresValue.go |   6 +-
 .../BACnetConstructedDataTimerResolution.go   |   6 +-
 .../BACnetConstructedDataTimerRunning.go      |   6 +-
 .../model/BACnetConstructedDataTimerState.go  |   6 +-
 .../BACnetConstructedDataTotalRecordCount.go  |   6 +-
 .../model/BACnetConstructedDataTraceFlag.go   |   6 +-
 .../BACnetConstructedDataTrackingValue.go     |   6 +-
 ...tructedDataTransactionNotificationClass.go |   6 +-
 .../model/BACnetConstructedDataTransition.go  |   6 +-
 .../model/BACnetConstructedDataTrendLogAll.go |   4 +-
 .../BACnetConstructedDataTrendLogLogBuffer.go |   6 +-
 ...ctedDataTrendLogLogDeviceObjectProperty.go |   6 +-
 ...ACnetConstructedDataTrendLogMultipleAll.go |   4 +-
 ...onstructedDataTrendLogMultipleLogBuffer.go |   6 +-
 ...TrendLogMultipleLogDeviceObjectProperty.go |   6 +-
 .../model/BACnetConstructedDataTrigger.go     |   6 +-
 .../model/BACnetConstructedDataUTCOffset.go   |   6 +-
 ...tedDataUTCTimeSynchronizationRecipients.go |   6 +-
 .../model/BACnetConstructedDataUnits.go       |   6 +-
 .../model/BACnetConstructedDataUnspecified.go |   6 +-
 .../BACnetConstructedDataUpdateInterval.go    |   6 +-
 ...ACnetConstructedDataUpdateKeySetTimeout.go |   6 +-
 .../model/BACnetConstructedDataUpdateTime.go  |   6 +-
 ...etConstructedDataUserExternalIdentifier.go |   6 +-
 ...ConstructedDataUserInformationReference.go |   6 +-
 .../model/BACnetConstructedDataUserName.go    |   6 +-
 .../model/BACnetConstructedDataUserType.go    |   6 +-
 .../BACnetConstructedDataUsesRemaining.go     |   6 +-
 ...BACnetConstructedDataVTClassesSupported.go |   6 +-
 .../BACnetConstructedDataValidSamples.go      |   6 +-
 .../BACnetConstructedDataValueBeforeChange.go |   6 +-
 .../BACnetConstructedDataValueChangeTime.go   |   6 +-
 .../model/BACnetConstructedDataValueSet.go    |   6 +-
 .../model/BACnetConstructedDataValueSource.go |  21 +-
 .../BACnetConstructedDataValueSourceArray.go  |   6 +-
 .../BACnetConstructedDataVarianceValue.go     |   6 +-
 .../BACnetConstructedDataVendorIdentifier.go  |   6 +-
 .../model/BACnetConstructedDataVendorName.go  |   6 +-
 .../BACnetConstructedDataVerificationTime.go  |   6 +-
 ...etConstructedDataVirtualMACAddressTable.go |   6 +-
 .../BACnetConstructedDataWeeklySchedule.go    |   6 +-
 .../BACnetConstructedDataWindowInterval.go    |   6 +-
 .../BACnetConstructedDataWindowSamples.go     |   6 +-
 .../model/BACnetConstructedDataWriteStatus.go |   6 +-
 .../model/BACnetConstructedDataZoneFrom.go    |   6 +-
 .../model/BACnetConstructedDataZoneMembers.go |   6 +-
 .../model/BACnetConstructedDataZoneTo.go      |   6 +-
 .../readwrite/model/BACnetContextTag.go       |   6 +-
 .../model/BACnetContextTagBitString.go        |   6 +-
 .../model/BACnetContextTagBoolean.go          |   6 +-
 .../model/BACnetContextTagCharacterString.go  |   6 +-
 .../readwrite/model/BACnetContextTagDate.go   |   6 +-
 .../readwrite/model/BACnetContextTagDouble.go |   6 +-
 .../model/BACnetContextTagEnumerated.go       |   6 +-
 .../readwrite/model/BACnetContextTagNull.go   |   4 +-
 .../model/BACnetContextTagObjectIdentifier.go |   6 +-
 .../model/BACnetContextTagOctetString.go      |   6 +-
 .../readwrite/model/BACnetContextTagReal.go   |   6 +-
 .../model/BACnetContextTagSignedInteger.go    |   6 +-
 .../readwrite/model/BACnetContextTagTime.go   |   6 +-
 .../model/BACnetContextTagUnknown.go          |   6 +-
 .../model/BACnetContextTagUnsignedInteger.go  |   6 +-
 .../BACnetCredentialAuthenticationFactor.go   |   6 +-
 .../readwrite/model/BACnetDailySchedule.go    |   6 +-
 .../readwrite/model/BACnetDataType.go         |   4 +-
 .../readwrite/model/BACnetDateRange.go        |   6 +-
 .../model/BACnetDateRangeEnclosed.go          |   6 +-
 .../readwrite/model/BACnetDateTime.go         |   6 +-
 .../readwrite/model/BACnetDateTimeEnclosed.go |   6 +-
 .../readwrite/model/BACnetDaysOfWeek.go       |   4 +-
 .../readwrite/model/BACnetDaysOfWeekTagged.go |   6 +-
 .../readwrite/model/BACnetDestination.go      |  21 +-
 .../BACnetDeviceObjectPropertyReference.go    |   6 +-
 ...etDeviceObjectPropertyReferenceEnclosed.go |   6 +-
 .../model/BACnetDeviceObjectReference.go      |   6 +-
 .../BACnetDeviceObjectReferenceEnclosed.go    |   6 +-
 .../readwrite/model/BACnetDeviceStatus.go     |   4 +-
 .../model/BACnetDeviceStatusTagged.go         |   6 +-
 .../readwrite/model/BACnetDoorAlarmState.go   |   4 +-
 .../model/BACnetDoorAlarmStateTagged.go       |   6 +-
 .../model/BACnetDoorSecuredStatus.go          |   4 +-
 .../model/BACnetDoorSecuredStatusTagged.go    |   6 +-
 .../readwrite/model/BACnetDoorStatus.go       |   4 +-
 .../readwrite/model/BACnetDoorStatusTagged.go |   6 +-
 .../readwrite/model/BACnetDoorValue.go        |   4 +-
 .../readwrite/model/BACnetDoorValueTagged.go  |   6 +-
 .../readwrite/model/BACnetEngineeringUnits.go |   4 +-
 .../model/BACnetEngineeringUnitsTagged.go     |   6 +-
 .../bacnetip/readwrite/model/BACnetError.go   |   4 +-
 .../readwrite/model/BACnetErrorGeneral.go     |   6 +-
 .../readwrite/model/BACnetEscalatorFault.go   |   4 +-
 .../model/BACnetEscalatorFaultTagged.go       |   6 +-
 .../readwrite/model/BACnetEscalatorMode.go    |   4 +-
 .../model/BACnetEscalatorModeTagged.go        |   6 +-
 .../BACnetEscalatorOperationDirection.go      |   4 +-
 ...BACnetEscalatorOperationDirectionTagged.go |   6 +-
 .../readwrite/model/BACnetEventLogRecord.go   |  21 +-
 .../model/BACnetEventLogRecordLogDatum.go     |   6 +-
 .../BACnetEventLogRecordLogDatumLogStatus.go  |   6 +-
 ...ACnetEventLogRecordLogDatumNotification.go |   6 +-
 .../BACnetEventLogRecordLogDatumTimeChange.go |   6 +-
 .../BACnetEventNotificationSubscription.go    |   6 +-
 .../readwrite/model/BACnetEventParameter.go   |   6 +-
 .../model/BACnetEventParameterAccessEvent.go  |   6 +-
 ...tParameterAccessEventListOfAccessEvents.go |   6 +-
 .../model/BACnetEventParameterBufferReady.go  |   6 +-
 .../BACnetEventParameterChangeOfBitstring.go  |   6 +-
 ...rChangeOfBitstringListOfBitstringValues.go |   6 +-
 ...etEventParameterChangeOfCharacterString.go |   6 +-
 ...hangeOfCharacterStringListOfAlarmValues.go |   6 +-
 ...CnetEventParameterChangeOfDiscreteValue.go |   6 +-
 .../BACnetEventParameterChangeOfLifeSavety.go |   6 +-
 ...eterChangeOfLifeSavetyListOfAlarmValues.go |   6 +-
 ...OfLifeSavetyListOfLifeSavetyAlarmValues.go |   6 +-
 .../BACnetEventParameterChangeOfState.go      |   6 +-
 ...EventParameterChangeOfStateListOfValues.go |   6 +-
 ...BACnetEventParameterChangeOfStatusFlags.go |   6 +-
 .../BACnetEventParameterChangeOfTimer.go      |   6 +-
 ...etEventParameterChangeOfTimerAlarmValue.go |   6 +-
 .../BACnetEventParameterChangeOfValue.go      |  21 +-
 ...tEventParameterChangeOfValueCivCriteria.go |   6 +-
 ...arameterChangeOfValueCivCriteriaBitmask.go |   6 +-
 ...eCivCriteriaReferencedPropertyIncrement.go |   6 +-
 .../BACnetEventParameterCommandFailure.go     |   6 +-
 .../BACnetEventParameterDoubleOutOfRange.go   |   6 +-
 .../model/BACnetEventParameterExtended.go     |   6 +-
 .../BACnetEventParameterExtendedParameters.go |   6 +-
 .../BACnetEventParameterFloatingLimit.go      |   6 +-
 .../model/BACnetEventParameterNone.go         |   6 +-
 .../model/BACnetEventParameterOutOfRange.go   |   6 +-
 .../BACnetEventParameterSignedOutOfRange.go   |   6 +-
 .../BACnetEventParameterUnsignedOutOfRange.go |   6 +-
 .../BACnetEventParameterUnsignedRange.go      |   6 +-
 .../readwrite/model/BACnetEventPriorities.go  |   6 +-
 .../readwrite/model/BACnetEventState.go       |   4 +-
 .../readwrite/model/BACnetEventStateTagged.go |   6 +-
 .../model/BACnetEventSummariesList.go         |   6 +-
 .../readwrite/model/BACnetEventSummary.go     |   6 +-
 .../readwrite/model/BACnetEventTimestamps.go  |  51 +-
 .../model/BACnetEventTimestampsEnclosed.go    |   6 +-
 .../model/BACnetEventTransitionBits.go        |   4 +-
 .../model/BACnetEventTransitionBitsTagged.go  |   6 +-
 .../readwrite/model/BACnetEventType.go        |   4 +-
 .../readwrite/model/BACnetEventTypeTagged.go  |   6 +-
 .../readwrite/model/BACnetFaultParameter.go   |   6 +-
 ...ACnetFaultParameterFaultCharacterString.go |   6 +-
 ...erFaultCharacterStringListOfFaultValues.go |   6 +-
 .../BACnetFaultParameterFaultExtended.go      |   6 +-
 ...etFaultParameterFaultExtendedParameters.go |   6 +-
 ...ltParameterFaultExtendedParametersEntry.go |   6 +-
 ...erFaultExtendedParametersEntryBitString.go |   6 +-
 ...eterFaultExtendedParametersEntryBoolean.go |   6 +-
 ...tExtendedParametersEntryCharacterString.go |   6 +-
 ...rameterFaultExtendedParametersEntryDate.go |   6 +-
 ...meterFaultExtendedParametersEntryDouble.go |   6 +-
 ...rFaultExtendedParametersEntryEnumerated.go |   6 +-
 ...eterFaultExtendedParametersEntryInteger.go |   6 +-
 ...rameterFaultExtendedParametersEntryNull.go |   6 +-
 ...ExtendedParametersEntryObjectidentifier.go |   6 +-
 ...FaultExtendedParametersEntryOctetString.go |   6 +-
 ...rameterFaultExtendedParametersEntryReal.go |   6 +-
 ...erFaultExtendedParametersEntryReference.go |   6 +-
 ...rameterFaultExtendedParametersEntryTime.go |   6 +-
 ...terFaultExtendedParametersEntryUnsigned.go |   6 +-
 .../BACnetFaultParameterFaultLifeSafety.go    |   6 +-
 ...rameterFaultLifeSafetyListOfFaultValues.go |   6 +-
 .../model/BACnetFaultParameterFaultListed.go  |   6 +-
 .../BACnetFaultParameterFaultOutOfRange.go    |  36 +-
 ...tParameterFaultOutOfRangeMaxNormalValue.go |   6 +-
 ...eterFaultOutOfRangeMaxNormalValueDouble.go |   6 +-
 ...terFaultOutOfRangeMaxNormalValueInteger.go |   6 +-
 ...ameterFaultOutOfRangeMaxNormalValueReal.go |   6 +-
 ...erFaultOutOfRangeMaxNormalValueUnsigned.go |   6 +-
 ...tParameterFaultOutOfRangeMinNormalValue.go |   6 +-
 ...eterFaultOutOfRangeMinNormalValueDouble.go |   6 +-
 ...terFaultOutOfRangeMinNormalValueInteger.go |   6 +-
 ...ameterFaultOutOfRangeMinNormalValueReal.go |   6 +-
 ...erFaultOutOfRangeMinNormalValueUnsigned.go |   6 +-
 .../model/BACnetFaultParameterFaultState.go   |   6 +-
 ...ultParameterFaultStateListOfFaultValues.go |   6 +-
 .../BACnetFaultParameterFaultStatusFlags.go   |   6 +-
 .../model/BACnetFaultParameterNone.go         |   6 +-
 .../readwrite/model/BACnetFaultType.go        |   4 +-
 .../readwrite/model/BACnetFaultTypeTagged.go  |   6 +-
 .../readwrite/model/BACnetFileAccessMethod.go |   4 +-
 .../model/BACnetFileAccessMethodTagged.go     |   6 +-
 .../model/BACnetGroupChannelValue.go          |  21 +-
 .../model/BACnetGroupChannelValueList.go      |   6 +-
 .../readwrite/model/BACnetHostAddress.go      |   6 +-
 .../model/BACnetHostAddressEnclosed.go        |  21 +-
 .../model/BACnetHostAddressIpAddress.go       |   6 +-
 .../readwrite/model/BACnetHostAddressName.go  |   6 +-
 .../readwrite/model/BACnetHostAddressNull.go  |   6 +-
 .../readwrite/model/BACnetHostNPort.go        |   6 +-
 .../model/BACnetHostNPortEnclosed.go          |   6 +-
 .../bacnetip/readwrite/model/BACnetIPMode.go  |   4 +-
 .../readwrite/model/BACnetIPModeTagged.go     |   6 +-
 .../readwrite/model/BACnetKeyIdentifier.go    |   6 +-
 .../model/BACnetLandingCallStatus.go          |  21 +-
 .../model/BACnetLandingCallStatusCommand.go   |   6 +-
 ...CnetLandingCallStatusCommandDestination.go |   6 +-
 ...BACnetLandingCallStatusCommandDirection.go |   6 +-
 .../model/BACnetLandingDoorStatus.go          |   6 +-
 ...BACnetLandingDoorStatusLandingDoorsList.go |   6 +-
 ...tLandingDoorStatusLandingDoorsListEntry.go |   6 +-
 .../readwrite/model/BACnetLifeSafetyMode.go   |   4 +-
 .../model/BACnetLifeSafetyModeTagged.go       |   6 +-
 .../model/BACnetLifeSafetyOperation.go        |   4 +-
 .../model/BACnetLifeSafetyOperationTagged.go  |   6 +-
 .../readwrite/model/BACnetLifeSafetyState.go  |   4 +-
 .../model/BACnetLifeSafetyStateTagged.go      |   6 +-
 .../readwrite/model/BACnetLiftCarCallList.go  |   6 +-
 .../model/BACnetLiftCarCallListFloorList.go   |   6 +-
 .../readwrite/model/BACnetLiftCarDirection.go |   4 +-
 .../model/BACnetLiftCarDirectionTagged.go     |   6 +-
 .../model/BACnetLiftCarDoorCommand.go         |   4 +-
 .../model/BACnetLiftCarDoorCommandTagged.go   |   6 +-
 .../model/BACnetLiftCarDriveStatus.go         |   4 +-
 .../model/BACnetLiftCarDriveStatusTagged.go   |   6 +-
 .../readwrite/model/BACnetLiftCarMode.go      |   4 +-
 .../model/BACnetLiftCarModeTagged.go          |   6 +-
 .../readwrite/model/BACnetLiftFault.go        |   4 +-
 .../readwrite/model/BACnetLiftFaultTagged.go  |   6 +-
 .../readwrite/model/BACnetLiftGroupMode.go    |   4 +-
 .../model/BACnetLiftGroupModeTagged.go        |   6 +-
 .../readwrite/model/BACnetLightingCommand.go  |   6 +-
 .../model/BACnetLightingCommandEnclosed.go    |   6 +-
 .../model/BACnetLightingInProgress.go         |   4 +-
 .../model/BACnetLightingInProgressTagged.go   |   6 +-
 .../model/BACnetLightingOperation.go          |   4 +-
 .../model/BACnetLightingOperationTagged.go    |   6 +-
 .../model/BACnetLightingTransition.go         |   4 +-
 .../model/BACnetLightingTransitionTagged.go   |   6 +-
 .../readwrite/model/BACnetLimitEnable.go      |   4 +-
 .../model/BACnetLimitEnableTagged.go          |   6 +-
 .../readwrite/model/BACnetLockStatus.go       |   4 +-
 .../readwrite/model/BACnetLockStatusTagged.go |   6 +-
 .../bacnetip/readwrite/model/BACnetLogData.go |   6 +-
 .../readwrite/model/BACnetLogDataLogData.go   |   6 +-
 .../model/BACnetLogDataLogDataEntry.go        |   6 +-
 .../BACnetLogDataLogDataEntryAnyValue.go      |  21 +-
 ...BACnetLogDataLogDataEntryBitStringValue.go |   6 +-
 .../BACnetLogDataLogDataEntryBooleanValue.go  |   6 +-
 ...ACnetLogDataLogDataEntryEnumeratedValue.go |   6 +-
 .../model/BACnetLogDataLogDataEntryFailure.go |   6 +-
 .../BACnetLogDataLogDataEntryIntegerValue.go  |   6 +-
 .../BACnetLogDataLogDataEntryNullValue.go     |   6 +-
 .../BACnetLogDataLogDataEntryRealValue.go     |   6 +-
 .../BACnetLogDataLogDataEntryUnsignedValue.go |   6 +-
 .../model/BACnetLogDataLogDataTimeChange.go   |   6 +-
 .../readwrite/model/BACnetLogDataLogStatus.go |   6 +-
 .../model/BACnetLogMultipleRecord.go          |  21 +-
 .../readwrite/model/BACnetLogRecord.go        |  21 +-
 .../model/BACnetLogRecordLogDatum.go          |   6 +-
 .../model/BACnetLogRecordLogDatumAnyValue.go  |  21 +-
 .../BACnetLogRecordLogDatumBitStringValue.go  |   6 +-
 .../BACnetLogRecordLogDatumBooleanValue.go    |   6 +-
 .../BACnetLogRecordLogDatumEnumeratedValue.go |   6 +-
 .../model/BACnetLogRecordLogDatumFailure.go   |   6 +-
 .../BACnetLogRecordLogDatumIntegerValue.go    |   6 +-
 .../model/BACnetLogRecordLogDatumLogStatus.go |   6 +-
 .../model/BACnetLogRecordLogDatumNullValue.go |   6 +-
 .../model/BACnetLogRecordLogDatumRealValue.go |   6 +-
 .../BACnetLogRecordLogDatumTimeChange.go      |   6 +-
 .../BACnetLogRecordLogDatumUnsignedValue.go   |   6 +-
 .../readwrite/model/BACnetLogStatus.go        |   4 +-
 .../readwrite/model/BACnetLogStatusTagged.go  |   6 +-
 .../readwrite/model/BACnetLoggingType.go      |   4 +-
 .../model/BACnetLoggingTypeTagged.go          |   6 +-
 .../readwrite/model/BACnetMaintenance.go      |   4 +-
 .../model/BACnetMaintenanceTagged.go          |   6 +-
 .../readwrite/model/BACnetNameValue.go        |  21 +-
 .../model/BACnetNameValueCollection.go        |   6 +-
 .../model/BACnetNetworkNumberQuality.go       |   4 +-
 .../model/BACnetNetworkNumberQualityTagged.go |   6 +-
 .../model/BACnetNetworkPortCommand.go         |   4 +-
 .../model/BACnetNetworkPortCommandTagged.go   |   6 +-
 .../model/BACnetNetworkSecurityPolicy.go      |   6 +-
 .../readwrite/model/BACnetNetworkType.go      |   4 +-
 .../model/BACnetNetworkTypeTagged.go          |   6 +-
 .../readwrite/model/BACnetNodeType.go         |   4 +-
 .../readwrite/model/BACnetNodeTypeTagged.go   |   6 +-
 .../model/BACnetNotificationParameters.go     |   6 +-
 ...BACnetNotificationParametersAccessEvent.go |   6 +-
 ...BACnetNotificationParametersBufferReady.go |   6 +-
 ...NotificationParametersChangeOfBitString.go |   6 +-
 ...cationParametersChangeOfCharacterString.go |   6 +-
 ...ficationParametersChangeOfDiscreteValue.go |  21 +-
 ...ParametersChangeOfDiscreteValueNewValue.go |   6 +-
 ...ersChangeOfDiscreteValueNewValueBoolean.go |   6 +-
 ...eOfDiscreteValueNewValueCharacterString.go |   6 +-
 ...rsChangeOfDiscreteValueNewValueDatetime.go |   6 +-
 ...ChangeOfDiscreteValueNewValueEnumerated.go |   6 +-
 ...ersChangeOfDiscreteValueNewValueInteger.go |   6 +-
 ...OfDiscreteValueNewValueObjectidentifier.go |   6 +-
 ...sChangeOfDiscreteValueNewValueOctetDate.go |   6 +-
 ...hangeOfDiscreteValueNewValueOctetString.go |   6 +-
 ...sChangeOfDiscreteValueNewValueOctetTime.go |   6 +-
 ...rsChangeOfDiscreteValueNewValueUnsigned.go |   6 +-
 ...otificationParametersChangeOfLifeSafety.go |   6 +-
 ...tificationParametersChangeOfReliability.go |   6 +-
 ...CnetNotificationParametersChangeOfState.go |   6 +-
 ...tificationParametersChangeOfStatusFlags.go |  21 +-
 ...CnetNotificationParametersChangeOfTimer.go |   6 +-
 ...CnetNotificationParametersChangeOfValue.go |  21 +-
 ...ficationParametersChangeOfValueNewValue.go |   6 +-
 ...ametersChangeOfValueNewValueChangedBits.go |   6 +-
 ...metersChangeOfValueNewValueChangedValue.go |   6 +-
 ...netNotificationParametersCommandFailure.go |  36 +-
 ...tNotificationParametersComplexEventType.go |   6 +-
 ...tNotificationParametersDoubleOutOfRange.go |   6 +-
 .../BACnetNotificationParametersExtended.go   |   6 +-
 ...otificationParametersExtendedParameters.go |   6 +-
 ...CnetNotificationParametersFloatingLimit.go |   6 +-
 .../BACnetNotificationParametersOutOfRange.go |   6 +-
 ...tNotificationParametersSignedOutOfRange.go |   6 +-
 ...otificationParametersUnsignedOutOfRange.go |   6 +-
 ...CnetNotificationParametersUnsignedRange.go |   6 +-
 .../readwrite/model/BACnetNotifyType.go       |   4 +-
 .../readwrite/model/BACnetNotifyTypeTagged.go |   6 +-
 .../model/BACnetObjectPropertyReference.go    |   6 +-
 .../BACnetObjectPropertyReferenceEnclosed.go  |   6 +-
 .../readwrite/model/BACnetObjectType.go       |   4 +-
 .../readwrite/model/BACnetObjectTypeTagged.go |   6 +-
 .../model/BACnetObjectTypesSupported.go       |   4 +-
 .../model/BACnetObjectTypesSupportedTagged.go |   6 +-
 .../readwrite/model/BACnetOpeningTag.go       |   6 +-
 .../readwrite/model/BACnetOptionalBinaryPV.go |   6 +-
 .../model/BACnetOptionalBinaryPVNull.go       |   6 +-
 .../model/BACnetOptionalBinaryPVValue.go      |   6 +-
 .../model/BACnetOptionalCharacterString.go    |   6 +-
 .../BACnetOptionalCharacterStringNull.go      |   6 +-
 .../BACnetOptionalCharacterStringValue.go     |   6 +-
 .../readwrite/model/BACnetOptionalREAL.go     |   6 +-
 .../readwrite/model/BACnetOptionalREALNull.go |   6 +-
 .../model/BACnetOptionalREALValue.go          |   6 +-
 .../readwrite/model/BACnetOptionalUnsigned.go |   6 +-
 .../model/BACnetOptionalUnsignedNull.go       |   6 +-
 .../model/BACnetOptionalUnsignedValue.go      |   6 +-
 .../readwrite/model/BACnetPolarity.go         |   4 +-
 .../readwrite/model/BACnetPolarityTagged.go   |   6 +-
 .../readwrite/model/BACnetPortPermission.go   |   6 +-
 .../readwrite/model/BACnetPrescale.go         |   6 +-
 .../readwrite/model/BACnetPriorityArray.go    |   6 +-
 .../readwrite/model/BACnetPriorityValue.go    |   6 +-
 .../model/BACnetPriorityValueBitString.go     |   6 +-
 .../model/BACnetPriorityValueBoolean.go       |   6 +-
 .../BACnetPriorityValueCharacterString.go     |   6 +-
 .../BACnetPriorityValueConstructedValue.go    |  21 +-
 .../model/BACnetPriorityValueDate.go          |   6 +-
 .../model/BACnetPriorityValueDateTime.go      |   6 +-
 .../model/BACnetPriorityValueDouble.go        |   6 +-
 .../model/BACnetPriorityValueEnumerated.go    |   6 +-
 .../model/BACnetPriorityValueInteger.go       |   6 +-
 .../model/BACnetPriorityValueNull.go          |   6 +-
 .../BACnetPriorityValueObjectidentifier.go    |   6 +-
 .../model/BACnetPriorityValueOctetString.go   |   6 +-
 .../model/BACnetPriorityValueReal.go          |   6 +-
 .../model/BACnetPriorityValueTime.go          |   6 +-
 .../model/BACnetPriorityValueUnsigned.go      |   6 +-
 .../model/BACnetProcessIdSelection.go         |   6 +-
 .../model/BACnetProcessIdSelectionNull.go     |   6 +-
 .../model/BACnetProcessIdSelectionValue.go    |   6 +-
 .../readwrite/model/BACnetProgramError.go     |   4 +-
 .../model/BACnetProgramErrorTagged.go         |   6 +-
 .../readwrite/model/BACnetProgramRequest.go   |   4 +-
 .../model/BACnetProgramRequestTagged.go       |   6 +-
 .../readwrite/model/BACnetProgramState.go     |   4 +-
 .../model/BACnetProgramStateTagged.go         |   6 +-
 .../model/BACnetPropertyAccessResult.go       |  21 +-
 .../BACnetPropertyAccessResultAccessResult.go |   6 +-
 ...ssResultAccessResultPropertyAccessError.go |   6 +-
 ...tyAccessResultAccessResultPropertyValue.go |  21 +-
 .../model/BACnetPropertyIdentifier.go         |   4 +-
 .../model/BACnetPropertyIdentifierTagged.go   |   6 +-
 .../model/BACnetPropertyReference.go          |   6 +-
 .../model/BACnetPropertyReferenceEnclosed.go  |   6 +-
 .../model/BACnetPropertyStateActionUnknown.go |   6 +-
 .../readwrite/model/BACnetPropertyStates.go   |   6 +-
 ...etPropertyStatesAccessCredentialDisable.go |   6 +-
 ...ertyStatesAccessCredentialDisableReason.go |   6 +-
 .../model/BACnetPropertyStatesAccessEvent.go  |   6 +-
 .../model/BACnetPropertyStatesAction.go       |   6 +-
 ...ACnetPropertyStatesAuthenticationStatus.go |   6 +-
 .../model/BACnetPropertyStatesBackupState.go  |   6 +-
 .../model/BACnetPropertyStatesBacnetIpMode.go |   6 +-
 ...ACnetPropertyStatesBinaryLightningValue.go |   6 +-
 .../model/BACnetPropertyStatesBinaryValue.go  |   6 +-
 .../model/BACnetPropertyStatesBoolean.go      |   6 +-
 .../BACnetPropertyStatesDoorAlarmState.go     |   6 +-
 .../BACnetPropertyStatesDoorSecuredStatus.go  |   6 +-
 .../model/BACnetPropertyStatesDoorStatus.go   |   6 +-
 .../model/BACnetPropertyStatesDoorValue.go    |   6 +-
 .../model/BACnetPropertyStatesEnclosed.go     |  21 +-
 .../BACnetPropertyStatesEscalatorFault.go     |   6 +-
 .../BACnetPropertyStatesEscalatorMode.go      |   6 +-
 ...opertyStatesEscalatorOperationDirection.go |   6 +-
 .../model/BACnetPropertyStatesEventType.go    |   6 +-
 .../BACnetPropertyStatesExtendedValue.go      |   6 +-
 .../BACnetPropertyStatesFileAccessMethod.go   |   6 +-
 .../model/BACnetPropertyStatesIntegerValue.go |   6 +-
 .../BACnetPropertyStatesLifeSafetyMode.go     |   6 +-
 ...ACnetPropertyStatesLifeSafetyOperations.go |   6 +-
 .../BACnetPropertyStatesLifeSafetyState.go    |   6 +-
 .../BACnetPropertyStatesLiftCarDirection.go   |   6 +-
 .../BACnetPropertyStatesLiftCarDoorCommand.go |   6 +-
 .../BACnetPropertyStatesLiftCarDriveStatus.go |   6 +-
 .../model/BACnetPropertyStatesLiftCarMode.go  |   6 +-
 .../model/BACnetPropertyStatesLiftFault.go    |   6 +-
 .../BACnetPropertyStatesLiftGroupMode.go      |   6 +-
 ...BACnetPropertyStatesLightningInProgress.go |   6 +-
 .../BACnetPropertyStatesLightningOperation.go |   6 +-
 ...BACnetPropertyStatesLightningTransition.go |   6 +-
 .../model/BACnetPropertyStatesLockStatus.go   |   6 +-
 .../model/BACnetPropertyStatesMaintenance.go  |   6 +-
 ...ACnetPropertyStatesNetworkNumberQuality.go |   6 +-
 .../BACnetPropertyStatesNetworkPortCommand.go |   6 +-
 .../model/BACnetPropertyStatesNetworkType.go  |   6 +-
 .../model/BACnetPropertyStatesNodeType.go     |   6 +-
 .../model/BACnetPropertyStatesNotifyType.go   |   6 +-
 .../model/BACnetPropertyStatesPolarity.go     |   6 +-
 .../BACnetPropertyStatesProgramChange.go      |   6 +-
 .../BACnetPropertyStatesProtocolLevel.go      |   6 +-
 .../BACnetPropertyStatesReasonForHalt.go      |   6 +-
 .../model/BACnetPropertyStatesReliability.go  |   6 +-
 .../BACnetPropertyStatesRestartReason.go      |   6 +-
 .../BACnetPropertyStatesSecurityLevel.go      |   6 +-
 .../model/BACnetPropertyStatesShedState.go    |   6 +-
 .../BACnetPropertyStatesSilencedState.go      |   6 +-
 .../model/BACnetPropertyStatesState.go        |   6 +-
 .../model/BACnetPropertyStatesSystemStatus.go |   6 +-
 .../model/BACnetPropertyStatesTimerState.go   |   6 +-
 .../BACnetPropertyStatesTimerTransition.go    |   6 +-
 .../model/BACnetPropertyStatesUnits.go        |   6 +-
 .../model/BACnetPropertyStatesWriteStatus.go  |   6 +-
 .../BACnetPropertyStatesZoneOccupanyState.go  |   6 +-
 .../readwrite/model/BACnetPropertyValue.go    |   6 +-
 .../readwrite/model/BACnetPropertyValues.go   |   6 +-
 .../model/BACnetPropertyWriteDefinition.go    |  21 +-
 .../readwrite/model/BACnetProtocolLevel.go    |   4 +-
 .../model/BACnetProtocolLevelTagged.go        |   6 +-
 .../model/BACnetReadAccessProperty.go         |   6 +-
 .../BACnetReadAccessPropertyReadResult.go     |  21 +-
 .../readwrite/model/BACnetReadAccessResult.go |   6 +-
 .../BACnetReadAccessResultListOfResults.go    |   6 +-
 .../model/BACnetReadAccessSpecification.go    |   6 +-
 .../readwrite/model/BACnetRecipient.go        |   6 +-
 .../readwrite/model/BACnetRecipientAddress.go |   6 +-
 .../readwrite/model/BACnetRecipientDevice.go  |   6 +-
 .../model/BACnetRecipientEnclosed.go          |  21 +-
 .../readwrite/model/BACnetRecipientProcess.go |   6 +-
 .../model/BACnetRecipientProcessEnclosed.go   |   6 +-
 .../readwrite/model/BACnetRejectReason.go     |   4 +-
 .../model/BACnetRejectReasonTagged.go         |   6 +-
 .../readwrite/model/BACnetRelationship.go     |   4 +-
 .../model/BACnetRelationshipTagged.go         |   6 +-
 .../readwrite/model/BACnetReliability.go      |   4 +-
 .../model/BACnetReliabilityTagged.go          |   6 +-
 .../readwrite/model/BACnetRestartReason.go    |   4 +-
 .../model/BACnetRestartReasonTagged.go        |   6 +-
 .../readwrite/model/BACnetResultFlags.go      |   4 +-
 .../model/BACnetResultFlagsTagged.go          |   6 +-
 .../readwrite/model/BACnetRouterEntry.go      |   6 +-
 .../model/BACnetRouterEntryStatus.go          |   4 +-
 .../model/BACnetRouterEntryStatusTagged.go    |   6 +-
 .../bacnetip/readwrite/model/BACnetScale.go   |   6 +-
 .../readwrite/model/BACnetScaleFloatScale.go  |   6 +-
 .../model/BACnetScaleIntegerScale.go          |   6 +-
 .../readwrite/model/BACnetSecurityKeySet.go   |   6 +-
 .../model/BACnetSecurityKeySetKeyIds.go       |   6 +-
 .../readwrite/model/BACnetSecurityLevel.go    |   4 +-
 .../model/BACnetSecurityLevelTagged.go        |   6 +-
 .../readwrite/model/BACnetSecurityPolicy.go   |   4 +-
 .../model/BACnetSecurityPolicyTagged.go       |   6 +-
 .../readwrite/model/BACnetSegmentation.go     |   4 +-
 .../model/BACnetSegmentationTagged.go         |   6 +-
 .../readwrite/model/BACnetServiceAck.go       |   6 +-
 .../model/BACnetServiceAckAtomicReadFile.go   |  21 +-
 .../BACnetServiceAckAtomicReadFileRecord.go   |   6 +-
 .../BACnetServiceAckAtomicReadFileStream.go   |   6 +-
 ...tServiceAckAtomicReadFileStreamOrRecord.go |   6 +-
 .../model/BACnetServiceAckAtomicWriteFile.go  |   6 +-
 .../model/BACnetServiceAckAuthenticate.go     |   6 +-
 ...ACnetServiceAckConfirmedPrivateTransfer.go |  21 +-
 .../model/BACnetServiceAckCreateObject.go     |   6 +-
 .../model/BACnetServiceAckGetAlarmSummary.go  |   6 +-
 .../BACnetServiceAckGetEnrollmentSummary.go   |   6 +-
 .../BACnetServiceAckGetEventInformation.go    |   6 +-
 .../model/BACnetServiceAckReadProperty.go     |  21 +-
 ...BACnetServiceAckReadPropertyConditional.go |   6 +-
 .../BACnetServiceAckReadPropertyMultiple.go   |   6 +-
 .../model/BACnetServiceAckReadRange.go        |  21 +-
 .../model/BACnetServiceAckRequestKey.go       |   6 +-
 .../readwrite/model/BACnetServiceAckVTData.go |   6 +-
 .../readwrite/model/BACnetServiceAckVTOpen.go |   6 +-
 .../model/BACnetServicesSupported.go          |   4 +-
 .../model/BACnetServicesSupportedTagged.go    |   6 +-
 .../model/BACnetSetpointReference.go          |   6 +-
 .../readwrite/model/BACnetShedLevel.go        |   6 +-
 .../readwrite/model/BACnetShedLevelAmount.go  |   6 +-
 .../readwrite/model/BACnetShedLevelLevel.go   |   6 +-
 .../readwrite/model/BACnetShedLevelPercent.go |   6 +-
 .../readwrite/model/BACnetShedState.go        |   4 +-
 .../readwrite/model/BACnetShedStateTagged.go  |   6 +-
 .../readwrite/model/BACnetSilencedState.go    |   4 +-
 .../model/BACnetSilencedStateTagged.go        |   6 +-
 .../readwrite/model/BACnetSpecialEvent.go     |  21 +-
 .../BACnetSpecialEventListOfTimeValues.go     |   6 +-
 .../model/BACnetSpecialEventPeriod.go         |   6 +-
 .../BACnetSpecialEventPeriodCalendarEntry.go  |   6 +-
 ...CnetSpecialEventPeriodCalendarReference.go |   6 +-
 .../readwrite/model/BACnetStatusFlags.go      |   4 +-
 .../model/BACnetStatusFlagsTagged.go          |   6 +-
 .../readwrite/model/BACnetTagHeader.go        |   6 +-
 .../model/BACnetTagPayloadBitString.go        |   6 +-
 .../model/BACnetTagPayloadBoolean.go          |   6 +-
 .../model/BACnetTagPayloadCharacterString.go  |   6 +-
 .../readwrite/model/BACnetTagPayloadDate.go   |   6 +-
 .../readwrite/model/BACnetTagPayloadDouble.go |   6 +-
 .../model/BACnetTagPayloadEnumerated.go       |   6 +-
 .../model/BACnetTagPayloadObjectIdentifier.go |   6 +-
 .../model/BACnetTagPayloadOctetString.go      |   6 +-
 .../readwrite/model/BACnetTagPayloadReal.go   |   6 +-
 .../model/BACnetTagPayloadSignedInteger.go    |   6 +-
 .../readwrite/model/BACnetTagPayloadTime.go   |   6 +-
 .../model/BACnetTagPayloadUnsignedInteger.go  |   6 +-
 .../readwrite/model/BACnetTimeStamp.go        |   6 +-
 .../model/BACnetTimeStampDateTime.go          |   6 +-
 .../model/BACnetTimeStampEnclosed.go          |  21 +-
 .../model/BACnetTimeStampSequence.go          |   6 +-
 .../readwrite/model/BACnetTimeStampTime.go    |   6 +-
 .../model/BACnetTimeStampsEnclosed.go         |   6 +-
 .../readwrite/model/BACnetTimeValue.go        |   6 +-
 .../readwrite/model/BACnetTimerState.go       |   4 +-
 .../model/BACnetTimerStateChangeValue.go      |   6 +-
 .../BACnetTimerStateChangeValueBitString.go   |   6 +-
 .../BACnetTimerStateChangeValueBoolean.go     |   6 +-
 ...netTimerStateChangeValueCharacterString.go |   6 +-
 ...etTimerStateChangeValueConstructedValue.go |  21 +-
 .../model/BACnetTimerStateChangeValueDate.go  |   6 +-
 .../BACnetTimerStateChangeValueDateTime.go    |   6 +-
 .../BACnetTimerStateChangeValueDouble.go      |   6 +-
 .../BACnetTimerStateChangeValueEnumerated.go  |   6 +-
 .../BACnetTimerStateChangeValueInteger.go     |   6 +-
 ...netTimerStateChangeValueLightingCommand.go |   6 +-
 .../BACnetTimerStateChangeValueNoValue.go     |   6 +-
 .../model/BACnetTimerStateChangeValueNull.go  |   6 +-
 ...etTimerStateChangeValueObjectidentifier.go |   6 +-
 .../BACnetTimerStateChangeValueOctetString.go |   6 +-
 .../model/BACnetTimerStateChangeValueReal.go  |   6 +-
 .../model/BACnetTimerStateChangeValueTime.go  |   6 +-
 .../BACnetTimerStateChangeValueUnsigned.go    |   6 +-
 .../readwrite/model/BACnetTimerStateTagged.go |   6 +-
 .../readwrite/model/BACnetTimerTransition.go  |   4 +-
 .../model/BACnetTimerTransitionTagged.go      |   6 +-
 .../model/BACnetUnconfirmedServiceChoice.go   |   4 +-
 .../BACnetUnconfirmedServiceChoiceTagged.go   |   6 +-
 .../model/BACnetUnconfirmedServiceRequest.go  |   6 +-
 .../BACnetUnconfirmedServiceRequestIAm.go     |   6 +-
 .../BACnetUnconfirmedServiceRequestIHave.go   |   6 +-
 ...firmedServiceRequestTimeSynchronization.go |   6 +-
 ...medServiceRequestUTCTimeSynchronization.go |   6 +-
 ...erviceRequestUnconfirmedCOVNotification.go |   6 +-
 ...questUnconfirmedCOVNotificationMultiple.go |   6 +-
 ...viceRequestUnconfirmedEventNotification.go |  21 +-
 ...erviceRequestUnconfirmedPrivateTransfer.go |  21 +-
 ...medServiceRequestUnconfirmedTextMessage.go |  21 +-
 .../BACnetUnconfirmedServiceRequestUnknown.go |   6 +-
 .../BACnetUnconfirmedServiceRequestWhoHas.go  |  21 +-
 ...etUnconfirmedServiceRequestWhoHasObject.go |   6 +-
 ...medServiceRequestWhoHasObjectIdentifier.go |   6 +-
 ...confirmedServiceRequestWhoHasObjectName.go |   6 +-
 .../BACnetUnconfirmedServiceRequestWhoIs.go   |   6 +-
 ...CnetUnconfirmedServiceRequestWriteGroup.go |   6 +-
 .../readwrite/model/BACnetVMACEntry.go        |   6 +-
 .../bacnetip/readwrite/model/BACnetVTClass.go |   4 +-
 .../readwrite/model/BACnetVTClassTagged.go    |   6 +-
 .../readwrite/model/BACnetVTSession.go        |   6 +-
 .../readwrite/model/BACnetValueSource.go      |   6 +-
 .../model/BACnetValueSourceAddress.go         |   6 +-
 .../readwrite/model/BACnetValueSourceNone.go  |   6 +-
 .../model/BACnetValueSourceObject.go          |   6 +-
 .../readwrite/model/BACnetVendorId.go         |   4 +-
 .../readwrite/model/BACnetVendorIdTagged.go   |   6 +-
 .../readwrite/model/BACnetWeekNDay.go         |   4 +-
 .../readwrite/model/BACnetWeekNDayTagged.go   |   6 +-
 .../model/BACnetWriteAccessSpecification.go   |   6 +-
 .../readwrite/model/BACnetWriteStatus.go      |   4 +-
 .../model/BACnetWriteStatusTagged.go          |   6 +-
 .../bacnetip/readwrite/model/BVLC.go          |   6 +-
 .../BVLCBroadcastDistributionTableEntry.go    |   6 +-
 .../BVLCDeleteForeignDeviceTableEntry.go      |   6 +-
 .../model/BVLCDistributeBroadcastToNetwork.go |   6 +-
 .../model/BVLCForeignDeviceTableEntry.go      |   6 +-
 .../readwrite/model/BVLCForwardedNPDU.go      |   6 +-
 .../model/BVLCOriginalBroadcastNPDU.go        |   6 +-
 .../model/BVLCOriginalUnicastNPDU.go          |   6 +-
 .../BVLCReadBroadcastDistributionTable.go     |   4 +-
 .../BVLCReadBroadcastDistributionTableAck.go  |   6 +-
 .../model/BVLCReadForeignDeviceTable.go       |   4 +-
 .../model/BVLCReadForeignDeviceTableAck.go    |   6 +-
 .../model/BVLCRegisterForeignDevice.go        |   6 +-
 .../bacnetip/readwrite/model/BVLCResult.go    |   6 +-
 .../readwrite/model/BVLCResultCode.go         |   4 +-
 .../readwrite/model/BVLCResultCodeTagged.go   |   6 +-
 .../readwrite/model/BVLCSecureBVLL.go         |   6 +-
 .../BVLCWriteBroadcastDistributionTable.go    |   6 +-
 .../readwrite/model/BacnetConstants.go        |   6 +-
 .../readwrite/model/ChangeListAddError.go     |   6 +-
 .../readwrite/model/ChangeListRemoveError.go  |   6 +-
 .../ConfirmedEventNotificationRequest.go      |  21 +-
 .../model/ConfirmedPrivateTransferError.go    |  21 +-
 .../readwrite/model/CreateObjectError.go      |   6 +-
 .../bacnetip/readwrite/model/Error.go         |   6 +-
 .../bacnetip/readwrite/model/ErrorClass.go    |   4 +-
 .../readwrite/model/ErrorClassTagged.go       |   6 +-
 .../bacnetip/readwrite/model/ErrorCode.go     |   4 +-
 .../readwrite/model/ErrorCodeTagged.go        |   6 +-
 .../bacnetip/readwrite/model/ErrorEnclosed.go |   6 +-
 .../readwrite/model/ListOfCovNotifications.go |   6 +-
 .../model/ListOfCovNotificationsList.go       |   6 +-
 .../model/ListOfCovNotificationsValue.go      |  21 +-
 .../readwrite/model/MaxApduLengthAccepted.go  |   4 +-
 .../readwrite/model/MaxSegmentsAccepted.go    |   4 +-
 .../protocols/bacnetip/readwrite/model/NLM.go |   6 +-
 .../readwrite/model/NLMChallengeRequest.go    |   6 +-
 .../model/NLMDisconnectConnectionToNetwork.go |   6 +-
 .../model/NLMEstablishConnectionToNetwork.go  |   6 +-
 .../readwrite/model/NLMIAmRouterToNetwork.go  |   6 +-
 .../model/NLMICouldBeRouterToNetwork.go       |   6 +-
 .../model/NLMInitializeRoutingTable.go        |   6 +-
 .../model/NLMInitializeRoutingTableAck.go     |   6 +-
 .../NLMInitializeRoutingTablePortMapping.go   |   6 +-
 .../readwrite/model/NLMNetworkNumberIs.go     |   6 +-
 .../model/NLMRejectMessageToNetwork.go        |   6 +-
 .../NLMRejectMessageToNetworkRejectReason.go  |   4 +-
 .../readwrite/model/NLMRequestKeyUpdate.go    |   6 +-
 .../readwrite/model/NLMRequestMasterKey.go    |   6 +-
 .../bacnetip/readwrite/model/NLMReserved.go   |   6 +-
 .../model/NLMRouterAvailableToNetwork.go      |   6 +-
 .../readwrite/model/NLMRouterBusyToNetwork.go |   6 +-
 .../readwrite/model/NLMSecurityPayload.go     |   6 +-
 .../readwrite/model/NLMSecurityResponse.go    |   6 +-
 .../readwrite/model/NLMSetMasterKey.go        |   6 +-
 .../model/NLMUpdateKeyDistributionKey.go      |   6 +-
 .../readwrite/model/NLMUpdateKeyUpdate.go     |   6 +-
 .../model/NLMUpdateKeyUpdateControlFlags.go   |   6 +-
 .../model/NLMUpdateKeyUpdateKeyEntry.go       |   6 +-
 .../model/NLMVendorProprietaryMessage.go      |   6 +-
 .../readwrite/model/NLMWhatIsNetworkNumber.go |   4 +-
 .../model/NLMWhoIsRouterToNetwork.go          |   6 +-
 .../bacnetip/readwrite/model/NPDU.go          |  36 +-
 .../bacnetip/readwrite/model/NPDUControl.go   |   6 +-
 .../readwrite/model/NPDUNetworkPriority.go    |   4 +-
 .../model/NPDUNetworkPriorityTagged.go        |   6 +-
 .../readwrite/model/SecurityResponseCode.go   |   4 +-
 .../model/SecurityResponseCodeTagged.go       |   6 +-
 .../SubscribeCOVPropertyMultipleError.go      |   6 +-
 ...rtyMultipleErrorFirstFailedSubscription.go |   6 +-
 .../bacnetip/readwrite/model/TagClass.go      |   4 +-
 .../bacnetip/readwrite/model/VTCloseError.go  |   6 +-
 .../VTCloseErrorListOfVTSessionIdentifiers.go |   6 +-
 .../model/WritePropertyMultipleError.go       |   6 +-
 .../protocols/cbus/readwrite/ParserHelper.go  |   3 +-
 .../cbus/readwrite/XmlParserHelper.go         |   3 +-
 .../readwrite/model/AccessControlCategory.go  |   4 +-
 .../model/AccessControlCommandType.go         |   4 +-
 .../AccessControlCommandTypeContainer.go      |   4 +-
 .../cbus/readwrite/model/AccessControlData.go |   6 +-
 .../AccessControlDataAccessPointClosed.go     |   4 +-
 .../AccessControlDataAccessPointForcedOpen.go |   4 +-
 .../AccessControlDataAccessPointLeftOpen.go   |   4 +-
 .../AccessControlDataCloseAccessPoint.go      |   4 +-
 .../AccessControlDataInvalidAccessRequest.go  |   6 +-
 .../model/AccessControlDataLockAccessPoint.go |   4 +-
 .../model/AccessControlDataRequestToExit.go   |   4 +-
 .../AccessControlDataValidAccessRequest.go    |   6 +-
 .../readwrite/model/AccessControlDirection.go |   4 +-
 .../model/AirConditioningCommandType.go       |   4 +-
 .../AirConditioningCommandTypeContainer.go    |   4 +-
 .../readwrite/model/AirConditioningData.go    |   6 +-
 ...irConditioningDataHumidityScheduleEntry.go |   6 +-
 .../AirConditioningDataHvacScheduleEntry.go   |   6 +-
 .../model/AirConditioningDataRefresh.go       |   6 +-
 ...ditioningDataSetHumidityLowerGuardLimit.go |   6 +-
 ...ConditioningDataSetHumiditySetbackLimit.go |   6 +-
 ...ditioningDataSetHumidityUpperGuardLimit.go |   6 +-
 ...rConditioningDataSetHvacLowerGuardLimit.go |   6 +-
 .../AirConditioningDataSetHvacSetbackLimit.go |   6 +-
 ...rConditioningDataSetHvacUpperGuardLimit.go |   6 +-
 ...irConditioningDataSetPlantHumidityLevel.go |   6 +-
 .../AirConditioningDataSetPlantHvacLevel.go   |   6 +-
 .../AirConditioningDataSetZoneGroupOff.go     |   6 +-
 .../AirConditioningDataSetZoneGroupOn.go      |   6 +-
 .../AirConditioningDataSetZoneHumidityMode.go |   6 +-
 .../AirConditioningDataSetZoneHvacMode.go     |   6 +-
 .../model/AirConditioningDataZoneHumidity.go  |   6 +-
 ...ConditioningDataZoneHumidityPlantStatus.go |   6 +-
 .../AirConditioningDataZoneHvacPlantStatus.go |   6 +-
 .../AirConditioningDataZoneTemperature.go     |   6 +-
 .../protocols/cbus/readwrite/model/Alpha.go   |   6 +-
 .../readwrite/model/ApplicationAddress1.go    |   6 +-
 .../readwrite/model/ApplicationAddress2.go    |   6 +-
 .../cbus/readwrite/model/ApplicationId.go     |   4 +-
 .../readwrite/model/ApplicationIdContainer.go |   4 +-
 .../cbus/readwrite/model/Attribute.go         |   4 +-
 .../cbus/readwrite/model/BaudRateSelector.go  |   4 +-
 .../cbus/readwrite/model/BridgeAddress.go     |   6 +-
 .../cbus/readwrite/model/CALCommandType.go    |   4 +-
 .../model/CALCommandTypeContainer.go          |   4 +-
 .../protocols/cbus/readwrite/model/CALData.go |  21 +-
 .../readwrite/model/CALDataAcknowledge.go     |   6 +-
 .../cbus/readwrite/model/CALDataGetStatus.go  |   6 +-
 .../cbus/readwrite/model/CALDataIdentify.go   |   6 +-
 .../readwrite/model/CALDataIdentifyReply.go   |  21 +-
 .../cbus/readwrite/model/CALDataRecall.go     |   6 +-
 .../cbus/readwrite/model/CALDataReply.go      |  21 +-
 .../cbus/readwrite/model/CALDataReset.go      |   4 +-
 .../cbus/readwrite/model/CALDataStatus.go     |   6 +-
 .../readwrite/model/CALDataStatusExtended.go  |   6 +-
 .../cbus/readwrite/model/CALDataWrite.go      |  21 +-
 .../cbus/readwrite/model/CALReply.go          |  21 +-
 .../cbus/readwrite/model/CALReplyLong.go      |   6 +-
 .../cbus/readwrite/model/CALReplyShort.go     |   4 +-
 .../cbus/readwrite/model/CBusCommand.go       |   6 +-
 .../model/CBusCommandDeviceManagement.go      |   6 +-
 .../model/CBusCommandPointToMultiPoint.go     |  21 +-
 .../model/CBusCommandPointToPoint.go          |  21 +-
 .../CBusCommandPointToPointToMultiPoint.go    |  21 +-
 .../cbus/readwrite/model/CBusConstants.go     |   6 +-
 .../cbus/readwrite/model/CBusHeader.go        |   6 +-
 .../cbus/readwrite/model/CBusMessage.go       |   4 +-
 .../readwrite/model/CBusMessageToClient.go    |  21 +-
 .../readwrite/model/CBusMessageToServer.go    |  21 +-
 .../cbus/readwrite/model/CBusOptions.go       |   6 +-
 .../model/CBusPointToMultiPointCommand.go     |   6 +-
 .../CBusPointToMultiPointCommandNormal.go     |  21 +-
 .../CBusPointToMultiPointCommandStatus.go     |  21 +-
 .../model/CBusPointToPointCommand.go          |  21 +-
 .../model/CBusPointToPointCommandDirect.go    |   6 +-
 .../model/CBusPointToPointCommandIndirect.go  |   6 +-
 .../CBusPointToPointToMultiPointCommand.go    |   6 +-
 ...usPointToPointToMultiPointCommandNormal.go |  21 +-
 ...usPointToPointToMultiPointCommandStatus.go |  21 +-
 .../cbus/readwrite/model/ChannelStatus.go     |   4 +-
 .../cbus/readwrite/model/Checksum.go          |   6 +-
 .../model/ClockAndTimekeepingCommandType.go   |   4 +-
 ...ClockAndTimekeepingCommandTypeContainer.go |   4 +-
 .../model/ClockAndTimekeepingData.go          |   6 +-
 .../ClockAndTimekeepingDataRequestRefresh.go  |   4 +-
 .../ClockAndTimekeepingDataUpdateDate.go      |   6 +-
 .../ClockAndTimekeepingDataUpdateTime.go      |   6 +-
 .../cbus/readwrite/model/Confirmation.go      |   6 +-
 .../cbus/readwrite/model/ConfirmationType.go  |   4 +-
 .../readwrite/model/CustomManufacturer.go     |   6 +-
 .../cbus/readwrite/model/CustomTypes.go       |   6 +-
 .../readwrite/model/DestinationAddressType.go |   4 +-
 .../readwrite/model/DialInFailureReason.go    |   4 +-
 .../readwrite/model/DialOutFailureReason.go   |   4 +-
 .../model/EnableControlCommandType.go         |   4 +-
 .../EnableControlCommandTypeContainer.go      |   4 +-
 .../cbus/readwrite/model/EnableControlData.go |   6 +-
 .../cbus/readwrite/model/EncodedReply.go      |   6 +-
 .../readwrite/model/EncodedReplyCALReply.go   |  21 +-
 .../model/ErrorReportingCommandType.go        |   4 +-
 .../ErrorReportingCommandTypeContainer.go     |   4 +-
 .../readwrite/model/ErrorReportingData.go     |   6 +-
 .../model/ErrorReportingDataGeneric.go        |   6 +-
 .../readwrite/model/ErrorReportingSeverity.go |   4 +-
 .../model/ErrorReportingSystemCategory.go     |  21 +-
 .../ErrorReportingSystemCategoryClass.go      |   4 +-
 .../model/ErrorReportingSystemCategoryType.go |   4 +-
 ...emCategoryTypeBuildingManagementSystems.go |   6 +-
 ...ingSystemCategoryTypeClimateControllers.go |   6 +-
 ...ategoryTypeForBuildingManagementSystems.go |   4 +-
 ...SystemCategoryTypeForClimateControllers.go |   4 +-
 ...eportingSystemCategoryTypeForInputUnits.go |   4 +-
 ...portingSystemCategoryTypeForOutputUnits.go |   4 +-
 ...ortingSystemCategoryTypeForSupportUnits.go |   4 +-
 ...orReportingSystemCategoryTypeInputUnits.go |   6 +-
 ...rReportingSystemCategoryTypeOutputUnits.go |   6 +-
 ...rrorReportingSystemCategoryTypeReserved.go |   6 +-
 ...ReportingSystemCategoryTypeSupportUnits.go |   6 +-
 .../ErrorReportingSystemCategoryVariant.go    |   4 +-
 .../cbus/readwrite/model/GAVState.go          |   4 +-
 .../readwrite/model/HVACAuxiliaryLevel.go     |   6 +-
 .../cbus/readwrite/model/HVACError.go         |   4 +-
 .../cbus/readwrite/model/HVACHumidity.go      |   6 +-
 .../cbus/readwrite/model/HVACHumidityError.go |   4 +-
 .../model/HVACHumidityModeAndFlags.go         |   6 +-
 .../model/HVACHumidityModeAndFlagsMode.go     |   4 +-
 .../model/HVACHumidityStatusFlags.go          |   6 +-
 .../cbus/readwrite/model/HVACHumidityType.go  |   4 +-
 .../cbus/readwrite/model/HVACModeAndFlags.go  |   6 +-
 .../readwrite/model/HVACModeAndFlagsMode.go   |   4 +-
 .../cbus/readwrite/model/HVACRawLevels.go     |   6 +-
 .../cbus/readwrite/model/HVACSensorStatus.go  |   4 +-
 .../cbus/readwrite/model/HVACStartTime.go     |   6 +-
 .../cbus/readwrite/model/HVACStatusFlags.go   |   6 +-
 .../cbus/readwrite/model/HVACTemperature.go   |   6 +-
 .../cbus/readwrite/model/HVACType.go          |   4 +-
 .../cbus/readwrite/model/HVACZoneList.go      |   6 +-
 .../readwrite/model/IdentifyReplyCommand.go   |   4 +-
 .../IdentifyReplyCommandCurrentSenseLevels.go |   6 +-
 .../model/IdentifyReplyCommandDSIStatus.go    |   6 +-
 .../model/IdentifyReplyCommandDelays.go       |   6 +-
 ...fyReplyCommandExtendedDiagnosticSummary.go |   6 +-
 .../IdentifyReplyCommandFirmwareVersion.go    |   6 +-
 ...dentifyReplyCommandGAVPhysicalAddresses.go |   6 +-
 .../IdentifyReplyCommandGAVValuesCurrent.go   |   6 +-
 .../IdentifyReplyCommandGAVValuesStored.go    |   6 +-
 .../IdentifyReplyCommandLogicalAssignment.go  |   6 +-
 .../model/IdentifyReplyCommandManufacturer.go |   6 +-
 .../IdentifyReplyCommandMaximumLevels.go      |   6 +-
 .../IdentifyReplyCommandMinimumLevels.go      |   6 +-
 ...entifyReplyCommandNetworkTerminalLevels.go |   6 +-
 .../IdentifyReplyCommandNetworkVoltage.go     |   6 +-
 .../IdentifyReplyCommandOutputUnitSummary.go  |   6 +-
 .../model/IdentifyReplyCommandSummary.go      |   6 +-
 .../IdentifyReplyCommandTerminalLevels.go     |   6 +-
 .../model/IdentifyReplyCommandType.go         |   6 +-
 .../model/IdentifyReplyCommandUnitSummary.go  |   6 +-
 .../cbus/readwrite/model/InterfaceOptions1.go |   6 +-
 .../model/InterfaceOptions1PowerUpSettings.go |   6 +-
 .../cbus/readwrite/model/InterfaceOptions2.go |   6 +-
 .../cbus/readwrite/model/InterfaceOptions3.go |   6 +-
 .../cbus/readwrite/model/Language.go          |   4 +-
 .../cbus/readwrite/model/LevelInformation.go  |   6 +-
 .../readwrite/model/LevelInformationAbsent.go |   6 +-
 .../model/LevelInformationCorrupted.go        |   6 +-
 .../model/LevelInformationNibblePair.go       |   4 +-
 .../readwrite/model/LevelInformationNormal.go |   6 +-
 .../readwrite/model/LightingCommandType.go    |   4 +-
 .../model/LightingCommandTypeContainer.go     |   4 +-
 .../readwrite/model/LightingCompatible.go     |   4 +-
 .../cbus/readwrite/model/LightingData.go      |   6 +-
 .../cbus/readwrite/model/LightingDataLabel.go |   6 +-
 .../cbus/readwrite/model/LightingDataOff.go   |   6 +-
 .../cbus/readwrite/model/LightingDataOn.go    |   6 +-
 .../model/LightingDataRampToLevel.go          |   6 +-
 .../model/LightingDataTerminateRamp.go        |   6 +-
 .../readwrite/model/LightingLabelFlavour.go   |   4 +-
 .../readwrite/model/LightingLabelOptions.go   |   6 +-
 .../cbus/readwrite/model/LightingLabelType.go |   4 +-
 .../cbus/readwrite/model/LineOffHookReason.go |   4 +-
 .../cbus/readwrite/model/LogicAssignment.go   |   6 +-
 .../readwrite/model/MeasurementCommandType.go |   4 +-
 .../model/MeasurementCommandTypeContainer.go  |   4 +-
 .../cbus/readwrite/model/MeasurementData.go   |   6 +-
 .../MeasurementDataChannelMeasurementData.go  |   6 +-
 .../cbus/readwrite/model/MeasurementUnits.go  |   4 +-
 .../model/MediaTransportControlCommandType.go |   4 +-
 ...diaTransportControlCommandTypeContainer.go |   4 +-
 .../model/MediaTransportControlData.go        |   6 +-
 .../MediaTransportControlDataCategoryName.go  |   6 +-
 ...lDataEnumerateCategoriesSelectionTracks.go |   6 +-
 ...diaTransportControlDataEnumerationsSize.go |   6 +-
 .../MediaTransportControlDataFastForward.go   |   6 +-
 ...ransportControlDataNextPreviousCategory.go |   6 +-
 ...ansportControlDataNextPreviousSelection.go |   6 +-
 ...iaTransportControlDataNextPreviousTrack.go |   6 +-
 .../MediaTransportControlDataPauseResume.go   |   6 +-
 .../model/MediaTransportControlDataPlay.go    |   4 +-
 .../MediaTransportControlDataRepeatOnOff.go   |   6 +-
 .../model/MediaTransportControlDataRewind.go  |   6 +-
 .../MediaTransportControlDataSelectionName.go |   6 +-
 .../MediaTransportControlDataSetCategory.go   |   6 +-
 .../MediaTransportControlDataSetSelection.go  |   6 +-
 .../MediaTransportControlDataSetTrack.go      |   6 +-
 .../MediaTransportControlDataShuffleOnOff.go  |   6 +-
 ...aTransportControlDataSourcePowerControl.go |   6 +-
 .../MediaTransportControlDataStatusRequest.go |   4 +-
 .../model/MediaTransportControlDataStop.go    |   4 +-
 .../MediaTransportControlDataTotalTracks.go   |   6 +-
 .../MediaTransportControlDataTrackName.go     |   6 +-
 .../readwrite/model/MeteringCommandType.go    |   4 +-
 .../model/MeteringCommandTypeContainer.go     |   4 +-
 .../cbus/readwrite/model/MeteringData.go      |   6 +-
 .../MeteringDataDrinkingWaterConsumption.go   |   6 +-
 .../MeteringDataElectricityConsumption.go     |   6 +-
 .../model/MeteringDataGasConsumption.go       |   6 +-
 .../model/MeteringDataMeasureDrinkingWater.go |   4 +-
 .../model/MeteringDataMeasureElectricity.go   |   4 +-
 .../readwrite/model/MeteringDataMeasureGas.go |   4 +-
 .../readwrite/model/MeteringDataMeasureOil.go |   4 +-
 .../model/MeteringDataMeasureOtherWater.go    |   4 +-
 .../model/MeteringDataOilConsumption.go       |   6 +-
 .../MeteringDataOtherWaterConsumption.go      |   6 +-
 .../cbus/readwrite/model/MonitoredSAL.go      |   6 +-
 .../model/MonitoredSALLongFormSmartMode.go    |  21 +-
 .../cbus/readwrite/model/MonitoredSALReply.go |  21 +-
 .../model/MonitoredSALShortFormBasicMode.go   |  21 +-
 .../NetworkProtocolControlInformation.go      |   6 +-
 .../cbus/readwrite/model/NetworkRoute.go      |   6 +-
 .../cbus/readwrite/model/PanicStatus.go       |   6 +-
 .../cbus/readwrite/model/Parameter.go         |   4 +-
 .../cbus/readwrite/model/ParameterChange.go   |   6 +-
 .../readwrite/model/ParameterChangeReply.go   |   6 +-
 .../cbus/readwrite/model/ParameterType.go     |   4 +-
 .../cbus/readwrite/model/ParameterValue.go    |   4 +-
 .../ParameterValueApplicationAddress1.go      |   6 +-
 .../ParameterValueApplicationAddress2.go      |   6 +-
 .../model/ParameterValueBaudRateSelector.go   |   6 +-
 .../model/ParameterValueCustomManufacturer.go |   6 +-
 .../model/ParameterValueCustomTypes.go        |   6 +-
 .../model/ParameterValueInterfaceOptions1.go  |   6 +-
 ...erValueInterfaceOptions1PowerUpSettings.go |   6 +-
 .../model/ParameterValueInterfaceOptions2.go  |   6 +-
 .../model/ParameterValueInterfaceOptions3.go  |   6 +-
 .../cbus/readwrite/model/ParameterValueRaw.go |   6 +-
 .../model/ParameterValueSerialNumber.go       |   6 +-
 .../protocols/cbus/readwrite/model/PowerUp.go |   6 +-
 .../cbus/readwrite/model/PowerUpReply.go      |   6 +-
 .../cbus/readwrite/model/PriorityClass.go     |   4 +-
 .../cbus/readwrite/model/ProtectionLevel.go   |   4 +-
 .../protocols/cbus/readwrite/model/Reply.go   |   6 +-
 .../cbus/readwrite/model/ReplyEncodedReply.go |  21 +-
 .../cbus/readwrite/model/ReplyNetwork.go      |   6 +-
 .../readwrite/model/ReplyOrConfirmation.go    |   6 +-
 .../model/ReplyOrConfirmationConfirmation.go  |  21 +-
 .../model/ReplyOrConfirmationReply.go         |  21 +-
 .../protocols/cbus/readwrite/model/Request.go |   6 +-
 .../cbus/readwrite/model/RequestCommand.go    |  21 +-
 .../cbus/readwrite/model/RequestContext.go    |   6 +-
 .../model/RequestDirectCommandAccess.go       |  21 +-
 .../cbus/readwrite/model/RequestEmpty.go      |   4 +-
 .../cbus/readwrite/model/RequestNull.go       |   6 +-
 .../cbus/readwrite/model/RequestObsolete.go   |  21 +-
 .../cbus/readwrite/model/RequestReset.go      |   6 +-
 .../model/RequestSmartConnectShortcut.go      |   6 +-
 .../readwrite/model/RequestTermination.go     |   6 +-
 .../cbus/readwrite/model/RequestType.go       |   4 +-
 .../readwrite/model/ResponseTermination.go    |   6 +-
 .../protocols/cbus/readwrite/model/SALData.go |  21 +-
 .../readwrite/model/SALDataAccessControl.go   |  21 +-
 .../readwrite/model/SALDataAirConditioning.go |  21 +-
 .../readwrite/model/SALDataAudioAndVideo.go   |  21 +-
 .../model/SALDataClockAndTimekeeping.go       |  21 +-
 .../readwrite/model/SALDataEnableControl.go   |   6 +-
 .../readwrite/model/SALDataErrorReporting.go  |  21 +-
 .../cbus/readwrite/model/SALDataFreeUsage.go  |   4 +-
 .../cbus/readwrite/model/SALDataHeating.go    |  21 +-
 .../readwrite/model/SALDataHvacActuator.go    |  21 +-
 .../model/SALDataIrrigationControl.go         |  21 +-
 .../cbus/readwrite/model/SALDataLighting.go   |  21 +-
 .../readwrite/model/SALDataMeasurement.go     |  21 +-
 .../readwrite/model/SALDataMediaTransport.go  |  21 +-
 .../cbus/readwrite/model/SALDataMetering.go   |  21 +-
 .../SALDataPoolsSpasPondsFountainsControl.go  |  21 +-
 .../cbus/readwrite/model/SALDataReserved.go   |   4 +-
 .../model/SALDataRoomControlSystem.go         |   4 +-
 .../cbus/readwrite/model/SALDataSecurity.go   |  21 +-
 .../model/SALDataTelephonyStatusAndControl.go |  21 +-
 .../model/SALDataTemperatureBroadcast.go      |   6 +-
 .../cbus/readwrite/model/SALDataTesting.go    |   4 +-
 .../readwrite/model/SALDataTriggerControl.go  |  21 +-
 .../readwrite/model/SALDataVentilation.go     |  21 +-
 .../cbus/readwrite/model/SecurityArmCode.go   |   6 +-
 .../readwrite/model/SecurityCommandType.go    |   4 +-
 .../model/SecurityCommandTypeContainer.go     |   4 +-
 .../cbus/readwrite/model/SecurityData.go      |   6 +-
 .../readwrite/model/SecurityDataAlarmOff.go   |   4 +-
 .../readwrite/model/SecurityDataAlarmOn.go    |   4 +-
 .../model/SecurityDataArmFailedCleared.go     |   4 +-
 .../model/SecurityDataArmFailedRaised.go      |   4 +-
 .../model/SecurityDataArmReadyNotReady.go     |   6 +-
 .../readwrite/model/SecurityDataArmSystem.go  |   6 +-
 .../model/SecurityDataCurrentAlarmType.go     |   4 +-
 .../model/SecurityDataDisplayMessage.go       |   6 +-
 .../readwrite/model/SecurityDataDropTamper.go |   4 +-
 .../model/SecurityDataEmulatedKeypad.go       |   6 +-
 .../model/SecurityDataEntryDelayStarted.go    |   4 +-
 .../cbus/readwrite/model/SecurityDataEvent.go |   6 +-
 .../model/SecurityDataExitDelayStarted.go     |   4 +-
 .../model/SecurityDataFireAlarmCleared.go     |   4 +-
 .../model/SecurityDataFireAlarmRaised.go      |   4 +-
 .../model/SecurityDataGasAlarmCleared.go      |   4 +-
 .../model/SecurityDataGasAlarmRaised.go       |   4 +-
 .../model/SecurityDataLineCutAlarmCleared.go  |   4 +-
 .../model/SecurityDataLineCutAlarmRaised.go   |   4 +-
 .../model/SecurityDataLowBatteryCharging.go   |   6 +-
 .../model/SecurityDataLowBatteryCorrected.go  |   4 +-
 .../model/SecurityDataLowBatteryDetected.go   |   4 +-
 .../model/SecurityDataMainsFailure.go         |   4 +-
 .../SecurityDataMainsRestoredOrApplied.go     |   4 +-
 .../cbus/readwrite/model/SecurityDataOff.go   |   6 +-
 .../cbus/readwrite/model/SecurityDataOn.go    |   6 +-
 .../model/SecurityDataOtherAlarmCleared.go    |   4 +-
 .../model/SecurityDataOtherAlarmRaised.go     |   4 +-
 .../model/SecurityDataPanicActivated.go       |   4 +-
 .../model/SecurityDataPanicCleared.go         |   4 +-
 .../model/SecurityDataPasswordEntryStatus.go  |   6 +-
 .../readwrite/model/SecurityDataRaiseAlarm.go |   4 +-
 .../model/SecurityDataRaiseTamper.go          |   4 +-
 .../model/SecurityDataRequestZoneName.go      |   6 +-
 .../model/SecurityDataStatus1Request.go       |   4 +-
 .../model/SecurityDataStatus2Request.go       |   4 +-
 .../model/SecurityDataStatusReport1.go        |   6 +-
 .../model/SecurityDataStatusReport2.go        |   6 +-
 .../model/SecurityDataSystemArmedDisarmed.go  |   6 +-
 .../model/SecurityDataSystemDisarmed.go       |   4 +-
 .../readwrite/model/SecurityDataTamperOff.go  |   4 +-
 .../readwrite/model/SecurityDataTamperOn.go   |   4 +-
 .../model/SecurityDataZoneIsolated.go         |   6 +-
 .../readwrite/model/SecurityDataZoneName.go   |   6 +-
 .../readwrite/model/SecurityDataZoneOpen.go   |   6 +-
 .../readwrite/model/SecurityDataZoneSealed.go |   6 +-
 .../readwrite/model/SecurityDataZoneShort.go  |   6 +-
 .../model/SecurityDataZoneUnsealed.go         |   6 +-
 .../readwrite/model/SerialInterfaceAddress.go |   6 +-
 .../cbus/readwrite/model/SerialNumber.go      |   6 +-
 .../cbus/readwrite/model/ServerErrorReply.go  |   6 +-
 .../cbus/readwrite/model/StatusByte.go        |   6 +-
 .../cbus/readwrite/model/StatusCoding.go      |   4 +-
 .../cbus/readwrite/model/StatusRequest.go     |   6 +-
 .../model/StatusRequestBinaryState.go         |   6 +-
 .../StatusRequestBinaryStateDeprecated.go     |   6 +-
 .../readwrite/model/StatusRequestLevel.go     |   6 +-
 .../cbus/readwrite/model/TamperStatus.go      |   6 +-
 .../readwrite/model/TelephonyCommandType.go   |   4 +-
 .../model/TelephonyCommandTypeContainer.go    |   4 +-
 .../cbus/readwrite/model/TelephonyData.go     |   6 +-
 .../model/TelephonyDataClearDiversion.go      |   4 +-
 .../model/TelephonyDataDialInFailure.go       |   6 +-
 .../model/TelephonyDataDialOutFailure.go      |   6 +-
 .../readwrite/model/TelephonyDataDivert.go    |   6 +-
 ...ephonyDataInternetConnectionRequestMade.go |   4 +-
 .../TelephonyDataIsolateSecondaryOutlet.go    |   6 +-
 .../model/TelephonyDataLineOffHook.go         |   6 +-
 .../model/TelephonyDataLineOnHook.go          |   4 +-
 .../model/TelephonyDataRecallLastNumber.go    |   6 +-
 .../TelephonyDataRecallLastNumberRequest.go   |   6 +-
 .../model/TelephonyDataRejectIncomingCall.go  |   4 +-
 .../readwrite/model/TelephonyDataRinging.go   |   6 +-
 .../model/TemperatureBroadcastCommandType.go  |   4 +-
 ...emperatureBroadcastCommandTypeContainer.go |   4 +-
 .../model/TemperatureBroadcastData.go         |   6 +-
 .../model/TriggerControlCommandType.go        |   4 +-
 .../TriggerControlCommandTypeContainer.go     |   4 +-
 .../readwrite/model/TriggerControlData.go     |   6 +-
 .../model/TriggerControlDataIndicatorKill.go  |   4 +-
 .../model/TriggerControlDataLabel.go          |   6 +-
 .../model/TriggerControlDataTriggerEvent.go   |   6 +-
 .../model/TriggerControlDataTriggerMax.go     |   4 +-
 .../model/TriggerControlDataTriggerMin.go     |   4 +-
 .../model/TriggerControlLabelFlavour.go       |   4 +-
 .../model/TriggerControlLabelOptions.go       |   6 +-
 .../model/TriggerControlLabelType.go          |   4 +-
 .../cbus/readwrite/model/UnitAddress.go       |   6 +-
 .../cbus/readwrite/model/UnitStatus.go        |   4 +-
 .../cbus/readwrite/model/ZoneStatus.go        |   6 +-
 .../cbus/readwrite/model/ZoneStatusTemp.go    |   4 +-
 .../protocols/df1/readwrite/ParserHelper.go   |   3 +-
 .../df1/readwrite/XmlParserHelper.go          |   3 +-
 .../df1/readwrite/model/DF1Command.go         |   6 +-
 .../df1/readwrite/model/DF1Symbol.go          |   6 +-
 .../readwrite/model/DF1SymbolMessageFrame.go  |  21 +-
 .../model/DF1SymbolMessageFrameACK.go         |   4 +-
 .../model/DF1SymbolMessageFrameNAK.go         |   4 +-
 .../model/DF1UnprotectedReadRequest.go        |   6 +-
 .../model/DF1UnprotectedReadResponse.go       |   6 +-
 .../protocols/eip/readwrite/ParserHelper.go   |   3 +-
 .../eip/readwrite/XmlParserHelper.go          |   3 +-
 .../model/AnsiExtendedSymbolSegment.go        |   6 +-
 .../eip/readwrite/model/CIPAttributes.go      |   6 +-
 .../eip/readwrite/model/CIPClassID.go         |   4 +-
 .../protocols/eip/readwrite/model/CIPData.go  |   6 +-
 .../eip/readwrite/model/CIPDataConnected.go   |   6 +-
 .../eip/readwrite/model/CIPDataTypeCode.go    |   4 +-
 .../eip/readwrite/model/CIPStatus.go          |   4 +-
 .../eip/readwrite/model/CIPStructTypeCode.go  |   4 +-
 .../readwrite/model/CipConnectedRequest.go    |   6 +-
 .../readwrite/model/CipConnectedResponse.go   |   6 +-
 .../model/CipConnectionManagerCloseRequest.go |  36 +-
 .../CipConnectionManagerCloseResponse.go      |   6 +-
 .../model/CipConnectionManagerRequest.go      |  36 +-
 .../model/CipConnectionManagerResponse.go     |   6 +-
 .../eip/readwrite/model/CipIdentity.go        |   6 +-
 .../eip/readwrite/model/CipRRData.go          |   6 +-
 .../eip/readwrite/model/CipReadRequest.go     |   6 +-
 .../eip/readwrite/model/CipReadResponse.go    |   6 +-
 .../readwrite/model/CipSecurityInformation.go |   6 +-
 .../eip/readwrite/model/CipService.go         |   6 +-
 .../readwrite/model/CipUnconnectedRequest.go  |  51 +-
 .../eip/readwrite/model/CipWriteRequest.go    |   6 +-
 .../eip/readwrite/model/CipWriteResponse.go   |   6 +-
 .../protocols/eip/readwrite/model/ClassID.go  |   6 +-
 .../eip/readwrite/model/ClassSegment.go       |   6 +-
 .../model/CommandSpecificDataItem.go          |   6 +-
 .../readwrite/model/ConnectedAddressItem.go   |   6 +-
 .../eip/readwrite/model/ConnectedDataItem.go  |  21 +-
 .../eip/readwrite/model/DataSegment.go        |  21 +-
 .../eip/readwrite/model/DataSegmentType.go    |   6 +-
 .../eip/readwrite/model/EiPCommand.go         |   4 +-
 .../readwrite/model/EipConnectionRequest.go   |   6 +-
 .../readwrite/model/EipConnectionResponse.go  |   6 +-
 .../eip/readwrite/model/EipConstants.go       |   6 +-
 .../readwrite/model/EipDisconnectRequest.go   |   4 +-
 .../readwrite/model/EipListIdentityRequest.go |   4 +-
 .../model/EipListIdentityResponse.go          |   6 +-
 .../eip/readwrite/model/EipPacket.go          |   6 +-
 .../readwrite/model/GetAttributeAllRequest.go |  36 +-
 .../model/GetAttributeAllResponse.go          |   6 +-
 .../model/GetAttributeListRequest.go          |   4 +-
 .../model/GetAttributeListResponse.go         |   4 +-
 .../model/GetAttributeSingleRequest.go        |   4 +-
 .../model/GetAttributeSingleResponse.go       |   4 +-
 .../eip/readwrite/model/InstanceID.go         |   6 +-
 .../eip/readwrite/model/InstanceSegment.go    |   6 +-
 .../readwrite/model/ListServicesRequest.go    |   4 +-
 .../readwrite/model/ListServicesResponse.go   |   6 +-
 .../eip/readwrite/model/LogicalSegment.go     |  21 +-
 .../eip/readwrite/model/LogicalSegmentType.go |   6 +-
 .../protocols/eip/readwrite/model/MemberID.go |   6 +-
 .../readwrite/model/MultipleServiceRequest.go |   6 +-
 .../model/MultipleServiceResponse.go          |   6 +-
 .../model/NetworkConnectionParameters.go      |   6 +-
 .../eip/readwrite/model/NullAddressItem.go    |   6 +-
 .../eip/readwrite/model/NullCommandRequest.go |   4 +-
 .../readwrite/model/NullCommandResponse.go    |   4 +-
 .../model/NullEipConnectionResponse.go        |   4 +-
 .../model/NullListServicesResponse.go         |   4 +-
 .../eip/readwrite/model/PathSegment.go        |   6 +-
 .../eip/readwrite/model/PortSegment.go        |  21 +-
 .../readwrite/model/PortSegmentExtended.go    |   6 +-
 .../eip/readwrite/model/PortSegmentNormal.go  |   6 +-
 .../eip/readwrite/model/PortSegmentType.go    |   6 +-
 .../eip/readwrite/model/SendUnitData.go       |   6 +-
 .../protocols/eip/readwrite/model/Services.go |   6 +-
 .../eip/readwrite/model/ServicesResponse.go   |   6 +-
 .../readwrite/model/SetAttributeAllRequest.go |   4 +-
 .../model/SetAttributeAllResponse.go          |   4 +-
 .../model/SetAttributeListRequest.go          |   4 +-
 .../model/SetAttributeListResponse.go         |   4 +-
 .../model/SetAttributeSingleRequest.go        |   4 +-
 .../model/SetAttributeSingleResponse.go       |   4 +-
 .../eip/readwrite/model/TransportType.go      |   6 +-
 .../protocols/eip/readwrite/model/TypeId.go   |   6 +-
 .../readwrite/model/UnConnectedDataItem.go    |  21 +-
 .../firmata/readwrite/ParserHelper.go         |   3 +-
 .../firmata/readwrite/XmlParserHelper.go      |   3 +-
 .../firmata/readwrite/model/FirmataCommand.go |   6 +-
 .../model/FirmataCommandProtocolVersion.go    |   6 +-
 .../model/FirmataCommandSetDigitalPinValue.go |   6 +-
 .../model/FirmataCommandSetPinMode.go         |   6 +-
 .../readwrite/model/FirmataCommandSysex.go    |  21 +-
 .../model/FirmataCommandSystemReset.go        |   4 +-
 .../firmata/readwrite/model/FirmataMessage.go |   6 +-
 .../readwrite/model/FirmataMessageAnalogIO.go |   6 +-
 .../readwrite/model/FirmataMessageCommand.go  |  21 +-
 .../model/FirmataMessageDigitalIO.go          |   6 +-
 .../FirmataMessageSubscribeAnalogPinValue.go  |   6 +-
 .../FirmataMessageSubscribeDigitalPinValue.go |   6 +-
 .../firmata/readwrite/model/PinMode.go        |   4 +-
 .../firmata/readwrite/model/SysexCommand.go   |   6 +-
 .../SysexCommandAnalogMappingQueryRequest.go  |   4 +-
 .../SysexCommandAnalogMappingQueryResponse.go |   6 +-
 .../SysexCommandAnalogMappingResponse.go      |   4 +-
 .../model/SysexCommandCapabilityQuery.go      |   4 +-
 .../model/SysexCommandCapabilityResponse.go   |   4 +-
 .../model/SysexCommandExtendedAnalog.go       |   4 +-
 .../readwrite/model/SysexCommandExtendedId.go |   6 +-
 .../model/SysexCommandPinStateQuery.go        |   6 +-
 .../model/SysexCommandPinStateResponse.go     |   6 +-
 .../SysexCommandReportFirmwareRequest.go      |   4 +-
 .../SysexCommandReportFirmwareResponse.go     |   6 +-
 .../model/SysexCommandSamplingInterval.go     |   4 +-
 .../readwrite/model/SysexCommandStringData.go |   4 +-
 .../model/SysexCommandSysexNonRealtime.go     |   4 +-
 .../model/SysexCommandSysexRealtime.go        |   4 +-
 .../knxnetip/readwrite/ParserHelper.go        |   3 +-
 .../knxnetip/readwrite/XmlParserHelper.go     |   3 +-
 .../knxnetip/readwrite/model/AccessLevel.go   |   4 +-
 .../knxnetip/readwrite/model/Apdu.go          |   6 +-
 .../knxnetip/readwrite/model/ApduControl.go   |   6 +-
 .../readwrite/model/ApduControlAck.go         |   4 +-
 .../readwrite/model/ApduControlConnect.go     |   4 +-
 .../readwrite/model/ApduControlContainer.go   |  21 +-
 .../readwrite/model/ApduControlDisconnect.go  |   4 +-
 .../readwrite/model/ApduControlNack.go        |   4 +-
 .../knxnetip/readwrite/model/ApduData.go      |   6 +-
 .../readwrite/model/ApduDataAdcRead.go        |   4 +-
 .../readwrite/model/ApduDataAdcResponse.go    |   4 +-
 .../readwrite/model/ApduDataContainer.go      |  21 +-
 .../model/ApduDataDeviceDescriptorRead.go     |   6 +-
 .../model/ApduDataDeviceDescriptorResponse.go |   6 +-
 .../knxnetip/readwrite/model/ApduDataExt.go   |   6 +-
 .../model/ApduDataExtAuthorizeRequest.go      |   6 +-
 .../model/ApduDataExtAuthorizeResponse.go     |   6 +-
 .../model/ApduDataExtDomainAddressRead.go     |   4 +-
 .../model/ApduDataExtDomainAddressResponse.go |   4 +-
 .../ApduDataExtDomainAddressSelectiveRead.go  |   4 +-
 ...pduDataExtDomainAddressSerialNumberRead.go |   4 +-
 ...ataExtDomainAddressSerialNumberResponse.go |   4 +-
 ...duDataExtDomainAddressSerialNumberWrite.go |   4 +-
 .../model/ApduDataExtDomainAddressWrite.go    |   4 +-
 .../model/ApduDataExtFileStreamInfoReport.go  |   4 +-
 ...ApduDataExtGroupPropertyValueInfoReport.go |   4 +-
 .../ApduDataExtGroupPropertyValueRead.go      |   4 +-
 .../ApduDataExtGroupPropertyValueResponse.go  |   4 +-
 .../ApduDataExtGroupPropertyValueWrite.go     |   4 +-
 ...ataExtIndividualAddressSerialNumberRead.go |   4 +-
 ...xtIndividualAddressSerialNumberResponse.go |   4 +-
 ...taExtIndividualAddressSerialNumberWrite.go |   4 +-
 .../readwrite/model/ApduDataExtKeyResponse.go |   4 +-
 .../readwrite/model/ApduDataExtKeyWrite.go    |   4 +-
 .../readwrite/model/ApduDataExtLinkRead.go    |   4 +-
 .../model/ApduDataExtLinkResponse.go          |   4 +-
 .../readwrite/model/ApduDataExtLinkWrite.go   |   4 +-
 .../model/ApduDataExtMemoryBitWrite.go        |   4 +-
 .../model/ApduDataExtNetworkParameterRead.go  |   4 +-
 .../ApduDataExtNetworkParameterResponse.go    |   4 +-
 .../model/ApduDataExtNetworkParameterWrite.go |   4 +-
 .../ApduDataExtOpenRoutingTableRequest.go     |   4 +-
 .../ApduDataExtPropertyDescriptionRead.go     |   6 +-
 .../ApduDataExtPropertyDescriptionResponse.go |   6 +-
 .../model/ApduDataExtPropertyValueRead.go     |   6 +-
 .../model/ApduDataExtPropertyValueResponse.go |   6 +-
 .../model/ApduDataExtPropertyValueWrite.go    |   6 +-
 .../ApduDataExtReadRouterMemoryRequest.go     |   4 +-
 .../ApduDataExtReadRouterMemoryResponse.go    |   4 +-
 .../ApduDataExtReadRouterStatusRequest.go     |   4 +-
 .../ApduDataExtReadRouterStatusResponse.go    |   4 +-
 .../ApduDataExtReadRoutingTableRequest.go     |   4 +-
 .../ApduDataExtReadRoutingTableResponse.go    |   4 +-
 .../ApduDataExtWriteRouterMemoryRequest.go    |   4 +-
 .../ApduDataExtWriteRouterStatusRequest.go    |   4 +-
 .../ApduDataExtWriteRoutingTableRequest.go    |   4 +-
 .../readwrite/model/ApduDataGroupValueRead.go |   6 +-
 .../model/ApduDataGroupValueResponse.go       |   6 +-
 .../model/ApduDataGroupValueWrite.go          |   6 +-
 .../model/ApduDataIndividualAddressRead.go    |   4 +-
 .../ApduDataIndividualAddressResponse.go      |   4 +-
 .../model/ApduDataIndividualAddressWrite.go   |   4 +-
 .../readwrite/model/ApduDataMemoryRead.go     |   6 +-
 .../readwrite/model/ApduDataMemoryResponse.go |   6 +-
 .../readwrite/model/ApduDataMemoryWrite.go    |   4 +-
 .../knxnetip/readwrite/model/ApduDataOther.go |  21 +-
 .../readwrite/model/ApduDataRestart.go        |   4 +-
 .../readwrite/model/ApduDataUserMessage.go    |   4 +-
 .../knxnetip/readwrite/model/CEMI.go          |   6 +-
 .../model/CEMIAdditionalInformation.go        |   6 +-
 ...CEMIAdditionalInformationBusmonitorInfo.go |   6 +-
 ...IAdditionalInformationRelativeTimestamp.go |   6 +-
 .../knxnetip/readwrite/model/CEMIPriority.go  |   4 +-
 .../readwrite/model/ChannelInformation.go     |   6 +-
 .../readwrite/model/ComObjectTable.go         |   4 +-
 .../model/ComObjectTableAddresses.go          |   4 +-
 .../model/ComObjectTableRealisationType1.go   |   6 +-
 .../model/ComObjectTableRealisationType2.go   |   6 +-
 .../model/ComObjectTableRealisationType6.go   |   6 +-
 .../readwrite/model/ComObjectValueType.go     |   4 +-
 .../readwrite/model/ConnectionRequest.go      |  21 +-
 .../model/ConnectionRequestInformation.go     |   6 +-
 ...ctionRequestInformationDeviceManagement.go |   4 +-
 ...ctionRequestInformationTunnelConnection.go |   6 +-
 .../readwrite/model/ConnectionResponse.go     |  21 +-
 .../model/ConnectionResponseDataBlock.go      |   6 +-
 ...ectionResponseDataBlockDeviceManagement.go |   4 +-
 ...ectionResponseDataBlockTunnelConnection.go |   6 +-
 .../readwrite/model/ConnectionStateRequest.go |   6 +-
 .../model/ConnectionStateResponse.go          |   6 +-
 .../knxnetip/readwrite/model/DIBDeviceInfo.go |   6 +-
 .../readwrite/model/DIBSuppSvcFamilies.go     |   6 +-
 .../readwrite/model/DescriptionRequest.go     |   6 +-
 .../readwrite/model/DescriptionResponse.go    |   6 +-
 .../readwrite/model/DeviceConfigurationAck.go |   6 +-
 .../model/DeviceConfigurationAckDataBlock.go  |   6 +-
 .../model/DeviceConfigurationRequest.go       |  21 +-
 .../DeviceConfigurationRequestDataBlock.go    |   6 +-
 .../readwrite/model/DeviceDescriptor.go       |   4 +-
 .../model/DeviceDescriptorMediumType.go       |   4 +-
 .../readwrite/model/DeviceDescriptorType2.go  |   6 +-
 .../knxnetip/readwrite/model/DeviceStatus.go  |   6 +-
 .../readwrite/model/DisconnectRequest.go      |   6 +-
 .../readwrite/model/DisconnectResponse.go     |   6 +-
 .../knxnetip/readwrite/model/FirmwareType.go  |   4 +-
 .../GroupObjectDescriptorRealisationType1.go  |   6 +-
 .../GroupObjectDescriptorRealisationType2.go  |   6 +-
 .../GroupObjectDescriptorRealisationType6.go  |   4 +-
 .../GroupObjectDescriptorRealisationType7.go  |   6 +-
 .../GroupObjectDescriptorRealisationTypeB.go  |   6 +-
 .../readwrite/model/HPAIControlEndpoint.go    |   6 +-
 .../readwrite/model/HPAIDataEndpoint.go       |   6 +-
 .../readwrite/model/HPAIDiscoveryEndpoint.go  |   6 +-
 .../readwrite/model/HostProtocolCode.go       |   4 +-
 .../knxnetip/readwrite/model/IPAddress.go     |   6 +-
 .../knxnetip/readwrite/model/KnxAddress.go    |   6 +-
 .../knxnetip/readwrite/model/KnxDatapoint.go  |   6 +-
 .../readwrite/model/KnxDatapointMainType.go   |   4 +-
 .../readwrite/model/KnxDatapointType.go       |   4 +-
 .../readwrite/model/KnxGroupAddress.go        |   4 +-
 .../readwrite/model/KnxGroupAddress2Level.go  |   6 +-
 .../readwrite/model/KnxGroupAddress3Level.go  |   6 +-
 .../model/KnxGroupAddressFreeLevel.go         |   6 +-
 .../model/KnxInterfaceObjectProperty.go       |   4 +-
 .../readwrite/model/KnxInterfaceObjectType.go |   4 +-
 .../knxnetip/readwrite/model/KnxLayer.go      |   4 +-
 .../readwrite/model/KnxManufacturer.go        |   4 +-
 .../knxnetip/readwrite/model/KnxMedium.go     |   4 +-
 .../knxnetip/readwrite/model/KnxNetIpCore.go  |   6 +-
 .../model/KnxNetIpDeviceManagement.go         |   6 +-
 .../readwrite/model/KnxNetIpMessage.go        |   6 +-
 .../readwrite/model/KnxNetIpRouting.go        |   6 +-
 .../readwrite/model/KnxNetIpTunneling.go      |   6 +-
 .../readwrite/model/KnxNetObjectServer.go     |   6 +-
 .../KnxNetRemoteConfigurationAndDiagnosis.go  |   6 +-
 .../readwrite/model/KnxNetRemoteLogging.go    |   6 +-
 .../knxnetip/readwrite/model/KnxProperty.go   |   6 +-
 .../readwrite/model/KnxPropertyDataType.go    |   4 +-
 .../knxnetip/readwrite/model/LBusmonInd.go    |  21 +-
 .../knxnetip/readwrite/model/LDataCon.go      |  21 +-
 .../knxnetip/readwrite/model/LDataExtended.go |  21 +-
 .../knxnetip/readwrite/model/LDataFrame.go    |   6 +-
 .../knxnetip/readwrite/model/LDataFrameACK.go |   4 +-
 .../knxnetip/readwrite/model/LDataInd.go      |  21 +-
 .../knxnetip/readwrite/model/LDataReq.go      |  21 +-
 .../knxnetip/readwrite/model/LPollData.go     |   6 +-
 .../knxnetip/readwrite/model/LPollDataCon.go  |   4 +-
 .../knxnetip/readwrite/model/LPollDataReq.go  |   4 +-
 .../knxnetip/readwrite/model/LRawCon.go       |   4 +-
 .../knxnetip/readwrite/model/LRawInd.go       |   4 +-
 .../knxnetip/readwrite/model/LRawReq.go       |   4 +-
 .../knxnetip/readwrite/model/MACAddress.go    |   6 +-
 .../readwrite/model/MFuncPropCommandReq.go    |   4 +-
 .../knxnetip/readwrite/model/MFuncPropCon.go  |   4 +-
 .../readwrite/model/MFuncPropStateReadReq.go  |   4 +-
 .../knxnetip/readwrite/model/MPropInfoInd.go  |   4 +-
 .../knxnetip/readwrite/model/MPropReadCon.go  |   6 +-
 .../knxnetip/readwrite/model/MPropReadReq.go  |   6 +-
 .../knxnetip/readwrite/model/MPropWriteCon.go |   4 +-
 .../knxnetip/readwrite/model/MPropWriteReq.go |   4 +-
 .../knxnetip/readwrite/model/MResetInd.go     |   4 +-
 .../knxnetip/readwrite/model/MResetReq.go     |   4 +-
 .../model/ProjectInstallationIdentifier.go    |   6 +-
 .../readwrite/model/RelativeTimestamp.go      |   6 +-
 .../readwrite/model/RoutingIndication.go      |   4 +-
 .../knxnetip/readwrite/model/SearchRequest.go |   6 +-
 .../readwrite/model/SearchResponse.go         |   6 +-
 .../knxnetip/readwrite/model/ServiceId.go     |   6 +-
 .../knxnetip/readwrite/model/Status.go        |   4 +-
 .../readwrite/model/SupportedPhysicalMedia.go |   4 +-
 .../readwrite/model/TDataConnectedInd.go      |   4 +-
 .../readwrite/model/TDataConnectedReq.go      |   4 +-
 .../readwrite/model/TDataIndividualInd.go     |   4 +-
 .../readwrite/model/TDataIndividualReq.go     |   4 +-
 .../readwrite/model/TunnelingRequest.go       |  21 +-
 .../model/TunnelingRequestDataBlock.go        |   6 +-
 .../readwrite/model/TunnelingResponse.go      |   6 +-
 .../model/TunnelingResponseDataBlock.go       |   6 +-
 .../readwrite/model/UnknownMessage.go         |   6 +-
 .../modbus/readwrite/ParserHelper.go          |   3 +-
 .../modbus/readwrite/XmlParserHelper.go       |   3 +-
 .../modbus/readwrite/model/DataItem.go        |   6 +-
 .../modbus/readwrite/model/DriverType.go      |   4 +-
 .../modbus/readwrite/model/ModbusADU.go       |   4 +-
 .../modbus/readwrite/model/ModbusAsciiADU.go  |  21 +-
 .../modbus/readwrite/model/ModbusConstants.go |   6 +-
 .../modbus/readwrite/model/ModbusDataType.go  |   4 +-
 .../ModbusDeviceInformationConformityLevel.go |   4 +-
 .../model/ModbusDeviceInformationLevel.go     |   4 +-
 .../ModbusDeviceInformationMoreFollows.go     |   4 +-
 .../model/ModbusDeviceInformationObject.go    |   6 +-
 .../modbus/readwrite/model/ModbusErrorCode.go |   4 +-
 .../modbus/readwrite/model/ModbusPDU.go       |   6 +-
 .../model/ModbusPDUDiagnosticRequest.go       |   6 +-
 .../model/ModbusPDUDiagnosticResponse.go      |   6 +-
 .../modbus/readwrite/model/ModbusPDUError.go  |   6 +-
 .../ModbusPDUGetComEventCounterRequest.go     |   4 +-
 .../ModbusPDUGetComEventCounterResponse.go    |   6 +-
 .../model/ModbusPDUGetComEventLogRequest.go   |   4 +-
 .../model/ModbusPDUGetComEventLogResponse.go  |   6 +-
 ...odbusPDUMaskWriteHoldingRegisterRequest.go |   6 +-
 ...dbusPDUMaskWriteHoldingRegisterResponse.go |   6 +-
 .../model/ModbusPDUReadCoilsRequest.go        |   6 +-
 .../model/ModbusPDUReadCoilsResponse.go       |   6 +-
 ...odbusPDUReadDeviceIdentificationRequest.go |   6 +-
 ...dbusPDUReadDeviceIdentificationResponse.go |   6 +-
 .../ModbusPDUReadDiscreteInputsRequest.go     |   6 +-
 .../ModbusPDUReadDiscreteInputsResponse.go    |   6 +-
 .../ModbusPDUReadExceptionStatusRequest.go    |   4 +-
 .../ModbusPDUReadExceptionStatusResponse.go   |   6 +-
 .../model/ModbusPDUReadFifoQueueRequest.go    |   6 +-
 .../model/ModbusPDUReadFifoQueueResponse.go   |   6 +-
 .../model/ModbusPDUReadFileRecordRequest.go   |   6 +-
 .../ModbusPDUReadFileRecordRequestItem.go     |   6 +-
 .../model/ModbusPDUReadFileRecordResponse.go  |   6 +-
 .../ModbusPDUReadFileRecordResponseItem.go    |   6 +-
 .../ModbusPDUReadHoldingRegistersRequest.go   |   6 +-
 .../ModbusPDUReadHoldingRegistersResponse.go  |   6 +-
 .../ModbusPDUReadInputRegistersRequest.go     |   6 +-
 .../ModbusPDUReadInputRegistersResponse.go    |   6 +-
 ...eadWriteMultipleHoldingRegistersRequest.go |   6 +-
 ...adWriteMultipleHoldingRegistersResponse.go |   6 +-
 .../model/ModbusPDUReportServerIdRequest.go   |   4 +-
 .../model/ModbusPDUReportServerIdResponse.go  |   6 +-
 .../model/ModbusPDUWriteFileRecordRequest.go  |   6 +-
 .../ModbusPDUWriteFileRecordRequestItem.go    |   6 +-
 .../model/ModbusPDUWriteFileRecordResponse.go |   6 +-
 .../ModbusPDUWriteFileRecordResponseItem.go   |   6 +-
 .../ModbusPDUWriteMultipleCoilsRequest.go     |   6 +-
 .../ModbusPDUWriteMultipleCoilsResponse.go    |   6 +-
 ...PDUWriteMultipleHoldingRegistersRequest.go |   6 +-
 ...DUWriteMultipleHoldingRegistersResponse.go |   6 +-
 .../model/ModbusPDUWriteSingleCoilRequest.go  |   6 +-
 .../model/ModbusPDUWriteSingleCoilResponse.go |   6 +-
 .../ModbusPDUWriteSingleRegisterRequest.go    |   6 +-
 .../ModbusPDUWriteSingleRegisterResponse.go   |   6 +-
 .../modbus/readwrite/model/ModbusRtuADU.go    |  21 +-
 .../modbus/readwrite/model/ModbusTcpADU.go    |  21 +-
 .../protocols/opcua/readwrite/ParserHelper.go |   3 +-
 .../opcua/readwrite/XmlParserHelper.go        |   3 +-
 .../readwrite/model/AccessLevelExType.go      |   4 +-
 .../opcua/readwrite/model/AccessLevelType.go  |   4 +-
 .../readwrite/model/AccessRestrictionType.go  |   4 +-
 .../readwrite/model/ActivateSessionRequest.go |  51 +-
 .../model/ActivateSessionResponse.go          |  21 +-
 .../opcua/readwrite/model/AddNodesItem.go     |   6 +-
 .../opcua/readwrite/model/AddNodesRequest.go  |  21 +-
 .../opcua/readwrite/model/AddNodesResponse.go |  21 +-
 .../opcua/readwrite/model/AddNodesResult.go   |   6 +-
 .../readwrite/model/AddReferencesItem.go      |   6 +-
 .../readwrite/model/AddReferencesRequest.go   |  21 +-
 .../readwrite/model/AddReferencesResponse.go  |  21 +-
 .../model/AdditionalParametersType.go         |   6 +-
 .../readwrite/model/AggregateConfiguration.go |   6 +-
 .../opcua/readwrite/model/AlarmMask.go        |   4 +-
 .../readwrite/model/AliasNameDataType.go      |   6 +-
 .../opcua/readwrite/model/Annotation.go       |   6 +-
 .../readwrite/model/AnnotationDataType.go     |   6 +-
 .../readwrite/model/AnonymousIdentityToken.go |   4 +-
 .../readwrite/model/ApplicationDescription.go |   6 +-
 .../model/ApplicationInstanceCertificate.go   |   4 +-
 .../opcua/readwrite/model/ApplicationType.go  |   4 +-
 .../opcua/readwrite/model/Argument.go         |   6 +-
 .../readwrite/model/AttributeWriteMask.go     |   4 +-
 .../opcua/readwrite/model/AudioDataType.go    |   4 +-
 .../opcua/readwrite/model/AxisInformation.go  |  36 +-
 .../readwrite/model/AxisScaleEnumeration.go   |   4 +-
 .../opcua/readwrite/model/BinaryPayload.go    |   6 +-
 .../readwrite/model/BitFieldDefinition.go     |   6 +-
 .../readwrite/model/BitFieldMaskDataType.go   |   4 +-
 .../model/BrokerTransportQualityOfService.go  |   4 +-
 .../readwrite/model/BrowseDescription.go      |   6 +-
 .../opcua/readwrite/model/BrowseDirection.go  |   4 +-
 .../readwrite/model/BrowseNextRequest.go      |  21 +-
 .../readwrite/model/BrowseNextResponse.go     |  21 +-
 .../opcua/readwrite/model/BrowsePath.go       |  21 +-
 .../opcua/readwrite/model/BrowsePathResult.go |   6 +-
 .../opcua/readwrite/model/BrowsePathTarget.go |   6 +-
 .../opcua/readwrite/model/BrowseRequest.go    |  36 +-
 .../opcua/readwrite/model/BrowseResponse.go   |  21 +-
 .../opcua/readwrite/model/BrowseResult.go     |   6 +-
 .../opcua/readwrite/model/BrowseResultMask.go |   4 +-
 .../opcua/readwrite/model/BuildInfo.go        |   6 +-
 .../opcua/readwrite/model/ByteStringArray.go  |   6 +-
 .../opcua/readwrite/model/ByteStringNodeId.go |   6 +-
 .../readwrite/model/CallMethodRequest.go      |   6 +-
 .../opcua/readwrite/model/CallMethodResult.go |   6 +-
 .../opcua/readwrite/model/CallRequest.go      |  21 +-
 .../opcua/readwrite/model/CallResponse.go     |  21 +-
 .../opcua/readwrite/model/CancelRequest.go    |  21 +-
 .../opcua/readwrite/model/CancelResponse.go   |  21 +-
 .../readwrite/model/CartesianCoordinates.go   |   4 +-
 .../readwrite/model/ChannelSecurityToken.go   |   6 +-
 .../opcua/readwrite/model/ChunkType.go        |   4 +-
 .../model/CloseSecureChannelRequest.go        |  21 +-
 .../model/CloseSecureChannelResponse.go       |  21 +-
 .../readwrite/model/CloseSessionRequest.go    |  21 +-
 .../readwrite/model/CloseSessionResponse.go   |  21 +-
 .../readwrite/model/ComplexNumberType.go      |   6 +-
 .../model/ConfigurationVersionDataType.go     |   6 +-
 .../model/ConnectionTransportDataType.go      |   4 +-
 .../opcua/readwrite/model/ContentFilter.go    |   6 +-
 .../readwrite/model/ContentFilterElement.go   |   6 +-
 .../model/ContentFilterElementResult.go       |   6 +-
 .../readwrite/model/ContentFilterResult.go    |   6 +-
 .../readwrite/model/ContinuationPoint.go      |   4 +-
 .../readwrite/model/ConversionLimitEnum.go    |   4 +-
 .../opcua/readwrite/model/Counter.go          |   4 +-
 .../model/CreateMonitoredItemsRequest.go      |  21 +-
 .../model/CreateMonitoredItemsResponse.go     |  21 +-
 .../readwrite/model/CreateSessionRequest.go   |  36 +-
 .../readwrite/model/CreateSessionResponse.go  |  36 +-
 .../model/CreateSubscriptionRequest.go        |  21 +-
 .../model/CreateSubscriptionResponse.go       |  21 +-
 .../opcua/readwrite/model/CurrencyUnitType.go |   6 +-
 .../readwrite/model/DataChangeNotification.go |   6 +-
 .../readwrite/model/DataChangeTrigger.go      |   4 +-
 .../model/DataSetFieldContentMask.go          |   4 +-
 .../readwrite/model/DataSetFieldFlags.go      |   4 +-
 .../readwrite/model/DataSetOrderingType.go    |   4 +-
 .../model/DataSetReaderMessageDataType.go     |   4 +-
 .../model/DataSetReaderTransportDataType.go   |   4 +-
 .../readwrite/model/DataSetWriterDataType.go  |   6 +-
 .../model/DataSetWriterMessageDataType.go     |   4 +-
 .../model/DataSetWriterTransportDataType.go   |   4 +-
 .../readwrite/model/DataTypeDefinition.go     |   4 +-
 .../readwrite/model/DataTypeDescription.go    |   6 +-
 .../readwrite/model/DataTypeSchemaHeader.go   |   6 +-
 .../opcua/readwrite/model/DataValue.go        |  21 +-
 .../opcua/readwrite/model/DateString.go       |   4 +-
 .../opcua/readwrite/model/DeadbandType.go     |   4 +-
 .../opcua/readwrite/model/DecimalString.go    |   4 +-
 .../model/DeleteMonitoredItemsRequest.go      |  21 +-
 .../model/DeleteMonitoredItemsResponse.go     |  21 +-
 .../opcua/readwrite/model/DeleteNodesItem.go  |   6 +-
 .../readwrite/model/DeleteNodesRequest.go     |  21 +-
 .../readwrite/model/DeleteNodesResponse.go    |  21 +-
 .../readwrite/model/DeleteReferencesItem.go   |   6 +-
 .../model/DeleteReferencesRequest.go          |  21 +-
 .../model/DeleteReferencesResponse.go         |  21 +-
 .../model/DeleteSubscriptionsRequest.go       |  21 +-
 .../model/DeleteSubscriptionsResponse.go      |  21 +-
 .../opcua/readwrite/model/DiagnosticInfo.go   |   6 +-
 .../opcua/readwrite/model/DiagnosticsLevel.go |   4 +-
 .../readwrite/model/DiscoveryConfiguration.go |   4 +-
 .../model/DoubleComplexNumberType.go          |   6 +-
 .../protocols/opcua/readwrite/model/Duplex.go |   4 +-
 .../opcua/readwrite/model/DurationString.go   |   4 +-
 .../opcua/readwrite/model/EUInformation.go    |   6 +-
 .../readwrite/model/EccEncryptedSecret.go     |   4 +-
 .../opcua/readwrite/model/EncodedTicket.go    |   4 +-
 .../readwrite/model/EndpointConfiguration.go  |   6 +-
 .../readwrite/model/EndpointDescription.go    |  21 +-
 .../opcua/readwrite/model/EndpointType.go     |   6 +-
 .../model/EndpointUrlListDataType.go          |   6 +-
 .../opcua/readwrite/model/EnumValueType.go    |   6 +-
 .../opcua/readwrite/model/EphemeralKeyType.go |   6 +-
 .../opcua/readwrite/model/EventFieldList.go   |   6 +-
 .../readwrite/model/EventNotificationList.go  |   6 +-
 .../readwrite/model/EventNotifierType.go      |   4 +-
 .../model/ExceptionDeviationFormat.go         |   4 +-
 .../opcua/readwrite/model/ExpandedNodeId.go   |  21 +-
 .../readwrite/model/ExtensiblePayload.go      |   6 +-
 .../opcua/readwrite/model/ExtensionHeader.go  |   6 +-
 .../opcua/readwrite/model/ExtensionObject.go  |  21 +-
 .../model/ExtensionObjectDefinition.go        |   4 +-
 .../model/ExtensionObjectEncodingMask.go      |   6 +-
 .../opcua/readwrite/model/FieldMetaData.go    |   6 +-
 .../readwrite/model/FieldTargetDataType.go    |  21 +-
 .../opcua/readwrite/model/FilterOperand.go    |   4 +-
 .../opcua/readwrite/model/FilterOperator.go   |   4 +-
 .../model/FindServersOnNetworkRequest.go      |  21 +-
 .../model/FindServersOnNetworkResponse.go     |  21 +-
 .../readwrite/model/FindServersRequest.go     |  21 +-
 .../readwrite/model/FindServersResponse.go    |  21 +-
 .../opcua/readwrite/model/FourByteNodeId.go   |   6 +-
 .../protocols/opcua/readwrite/model/Frame.go  |   4 +-
 .../readwrite/model/GenericAttributeValue.go  |  21 +-
 .../readwrite/model/GetEndpointsRequest.go    |  21 +-
 .../readwrite/model/GetEndpointsResponse.go   |  21 +-
 .../opcua/readwrite/model/GuidNodeId.go       |   6 +-
 .../opcua/readwrite/model/GuidValue.go        |   6 +-
 .../protocols/opcua/readwrite/model/Handle.go |   4 +-
 .../opcua/readwrite/model/HistoryData.go      |   6 +-
 .../opcua/readwrite/model/HistoryEvent.go     |   6 +-
 .../readwrite/model/HistoryEventFieldList.go  |   6 +-
 .../readwrite/model/HistoryReadDetails.go     |   4 +-
 .../readwrite/model/HistoryReadRequest.go     |  21 +-
 .../readwrite/model/HistoryReadResponse.go    |  21 +-
 .../readwrite/model/HistoryReadResult.go      |   6 +-
 .../readwrite/model/HistoryReadValueId.go     |   6 +-
 .../readwrite/model/HistoryUpdateDetails.go   |   4 +-
 .../readwrite/model/HistoryUpdateRequest.go   |  21 +-
 .../readwrite/model/HistoryUpdateResponse.go  |  21 +-
 .../readwrite/model/HistoryUpdateResult.go    |   6 +-
 .../readwrite/model/HistoryUpdateType.go      |   4 +-
 .../protocols/opcua/readwrite/model/IdType.go |   4 +-
 .../readwrite/model/IdentityCriteriaType.go   |   4 +-
 .../model/IdentityMappingRuleType.go          |   6 +-
 .../opcua/readwrite/model/ImageBMP.go         |   4 +-
 .../opcua/readwrite/model/ImageGIF.go         |   4 +-
 .../opcua/readwrite/model/ImageJPG.go         |   4 +-
 .../opcua/readwrite/model/ImagePNG.go         |   4 +-
 .../protocols/opcua/readwrite/model/Index.go  |   4 +-
 .../opcua/readwrite/model/IntegerId.go        |   4 +-
 .../readwrite/model/InterfaceAdminStatus.go   |   4 +-
 .../readwrite/model/InterfaceOperStatus.go    |   4 +-
 .../readwrite/model/IssuedIdentityToken.go    |   6 +-
 .../model/JsonDataSetMessageContentMask.go    |   4 +-
 .../model/JsonNetworkMessageContentMask.go    |   4 +-
 .../opcua/readwrite/model/KeyValuePair.go     |  21 +-
 .../model/LinearConversionDataType.go         |   6 +-
 .../opcua/readwrite/model/LocaleId.go         |   4 +-
 .../opcua/readwrite/model/LocalizedText.go    |   6 +-
 .../opcua/readwrite/model/MessagePDU.go       |   6 +-
 .../readwrite/model/MessageSecurityMode.go    |   4 +-
 .../opcua/readwrite/model/MessageType.go      |   4 +-
 .../model/ModelChangeStructureDataType.go     |   6 +-
 .../model/ModelChangeStructureVerbMask.go     |   4 +-
 .../opcua/readwrite/model/ModificationInfo.go |   6 +-
 .../model/ModifyMonitoredItemsRequest.go      |  21 +-
 .../model/ModifyMonitoredItemsResponse.go     |  21 +-
 .../model/ModifySubscriptionRequest.go        |  21 +-
 .../model/ModifySubscriptionResponse.go       |  21 +-
 .../model/MonitoredItemCreateRequest.go       |  36 +-
 .../model/MonitoredItemCreateResult.go        |   6 +-
 .../model/MonitoredItemModifyRequest.go       |  21 +-
 .../model/MonitoredItemModifyResult.go        |   6 +-
 .../model/MonitoredItemNotification.go        |   6 +-
 .../opcua/readwrite/model/MonitoringFilter.go |   4 +-
 .../readwrite/model/MonitoringFilterResult.go |   4 +-
 .../opcua/readwrite/model/MonitoringMode.go   |   4 +-
 .../readwrite/model/MonitoringParameters.go   |   6 +-
 .../opcua/readwrite/model/NamingRuleType.go   |   4 +-
 .../readwrite/model/NegotiationStatus.go      |   4 +-
 .../readwrite/model/NetworkAddressDataType.go |   6 +-
 .../readwrite/model/NetworkGroupDataType.go   |   6 +-
 .../opcua/readwrite/model/NodeAttributes.go   |   6 +-
 .../readwrite/model/NodeAttributesMask.go     |   4 +-
 .../opcua/readwrite/model/NodeClass.go        |   4 +-
 .../protocols/opcua/readwrite/model/NodeId.go |  21 +-
 .../opcua/readwrite/model/NodeIdByteString.go |   6 +-
 .../opcua/readwrite/model/NodeIdFourByte.go   |   6 +-
 .../opcua/readwrite/model/NodeIdGuid.go       |   6 +-
 .../opcua/readwrite/model/NodeIdNumeric.go    |   6 +-
 .../opcua/readwrite/model/NodeIdString.go     |   6 +-
 .../opcua/readwrite/model/NodeIdTwoByte.go    |   6 +-
 .../opcua/readwrite/model/NodeIdType.go       |   4 +-
 .../readwrite/model/NodeIdTypeDefinition.go   |   6 +-
 .../opcua/readwrite/model/NodeReference.go    |   6 +-
 .../readwrite/model/NodeTypeDescription.go    |   6 +-
 .../opcua/readwrite/model/NormalizedString.go |   4 +-
 .../opcua/readwrite/model/NotificationData.go |   4 +-
 .../readwrite/model/NotificationMessage.go    |   6 +-
 .../opcua/readwrite/model/NullExtension.go    |   4 +-
 .../opcua/readwrite/model/NumericNodeId.go    |   6 +-
 .../opcua/readwrite/model/NumericRange.go     |   4 +-
 .../opcua/readwrite/model/OpcuaAPU.go         |  21 +-
 .../model/OpcuaAcknowledgeResponse.go         |   6 +-
 .../readwrite/model/OpcuaCloseRequest.go      |  21 +-
 .../opcua/readwrite/model/OpcuaConstants.go   |   6 +-
 .../opcua/readwrite/model/OpcuaDataType.go    |   4 +-
 .../readwrite/model/OpcuaHelloRequest.go      |   6 +-
 .../readwrite/model/OpcuaIdentifierType.go    |   4 +-
 .../readwrite/model/OpcuaMessageError.go      |   6 +-
 .../readwrite/model/OpcuaMessageRequest.go    |  21 +-
 .../readwrite/model/OpcuaMessageResponse.go   |  21 +-
 .../model/OpcuaNodeIdServicesDataType.go      |   4 +-
 .../model/OpcuaNodeIdServicesMethod.go        |   4 +-
 .../model/OpcuaNodeIdServicesObject.go        |   4 +-
 .../model/OpcuaNodeIdServicesObjectType.go    |   4 +-
 .../model/OpcuaNodeIdServicesReferenceType.go |   4 +-
 .../OpcuaNodeIdServicesVariableAccess.go      |   4 +-
 ...uaNodeIdServicesVariableAcknowledgeable.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableAdd.go   |   4 +-
 .../OpcuaNodeIdServicesVariableAggregate.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableAlarm.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableAlias.go |   4 +-
 .../OpcuaNodeIdServicesVariableAliases.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableAllow.go |   4 +-
 .../OpcuaNodeIdServicesVariableAlternative.go |   4 +-
 .../OpcuaNodeIdServicesVariableAnalog.go      |   4 +-
 .../OpcuaNodeIdServicesVariableAnnotations.go |   4 +-
 .../OpcuaNodeIdServicesVariableApplication.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableArray.go |   4 +-
 .../OpcuaNodeIdServicesVariableAttribute.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableAudio.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableAudit.go |   4 +-
 ...pcuaNodeIdServicesVariableAuthorization.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableAxis.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableBase.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableBit.go   |   4 +-
 .../OpcuaNodeIdServicesVariableBroker.go      |   4 +-
 .../OpcuaNodeIdServicesVariableBrowse.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableBuild.go |   4 +-
 .../OpcuaNodeIdServicesVariableCartesian.go   |   4 +-
 .../OpcuaNodeIdServicesVariableCertificate.go |   4 +-
 .../OpcuaNodeIdServicesVariableChange.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableClose.go |   4 +-
 .../OpcuaNodeIdServicesVariableCondition.go   |   4 +-
 .../OpcuaNodeIdServicesVariableConnect.go     |   4 +-
 .../OpcuaNodeIdServicesVariableConversion.go  |   4 +-
 .../OpcuaNodeIdServicesVariableCreate.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableCube.go  |   4 +-
 .../OpcuaNodeIdServicesVariableCurrency.go    |   4 +-
 .../model/OpcuaNodeIdServicesVariableData.go  |   4 +-
 .../OpcuaNodeIdServicesVariableDatagram.go    |   4 +-
 .../OpcuaNodeIdServicesVariableDeadband.go    |   4 +-
 .../OpcuaNodeIdServicesVariableDefault.go     |   4 +-
 .../OpcuaNodeIdServicesVariableDelete.go      |   4 +-
 .../OpcuaNodeIdServicesVariableDiagnostics.go |   4 +-
 .../OpcuaNodeIdServicesVariableDialog.go      |   4 +-
 .../OpcuaNodeIdServicesVariableDisconnect.go  |   4 +-
 .../OpcuaNodeIdServicesVariableDiscrepancy.go |   4 +-
 .../OpcuaNodeIdServicesVariableDuplex.go      |   4 +-
 .../OpcuaNodeIdServicesVariableEngineering.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableEnum.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableEvent.go |   4 +-
 .../OpcuaNodeIdServicesVariableException.go   |   4 +-
 .../OpcuaNodeIdServicesVariableExclusive.go   |   4 +-
 .../OpcuaNodeIdServicesVariableExpression.go  |   4 +-
 .../OpcuaNodeIdServicesVariableExtension.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableFile.go  |   4 +-
 .../OpcuaNodeIdServicesVariableFilter.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableFind.go  |   4 +-
 .../OpcuaNodeIdServicesVariableFinite.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableFrame.go |   4 +-
 .../OpcuaNodeIdServicesVariableGeneral.go     |   4 +-
 .../OpcuaNodeIdServicesVariableGenerate.go    |   4 +-
 .../model/OpcuaNodeIdServicesVariableGet.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableH.go     |   4 +-
 .../OpcuaNodeIdServicesVariableHistorical.go  |   4 +-
 .../OpcuaNodeIdServicesVariableHistory.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableI.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableIcon.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableId.go    |   4 +-
 .../OpcuaNodeIdServicesVariableIdentity.go    |   4 +-
 .../model/OpcuaNodeIdServicesVariableIetf.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableImage.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableInput.go |   4 +-
 .../OpcuaNodeIdServicesVariableInterface.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableJson.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableKey.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableLimit.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableLocal.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableMax.go   |   4 +-
 .../OpcuaNodeIdServicesVariableMessage.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableModel.go |   4 +-
 .../OpcuaNodeIdServicesVariableModify.go      |   4 +-
 .../OpcuaNodeIdServicesVariableMonitoring.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableMove.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableMulti.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableN.go     |   4 +-
 .../OpcuaNodeIdServicesVariableNamespace.go   |   4 +-
 .../OpcuaNodeIdServicesVariableNamespaces.go  |   4 +-
 .../OpcuaNodeIdServicesVariableNaming.go      |   4 +-
 .../OpcuaNodeIdServicesVariableNegotiation.go |   4 +-
 .../OpcuaNodeIdServicesVariableNetwork.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableNode.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableNon.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableO.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableOff.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableOpc.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableOpen.go  |   4 +-
 .../OpcuaNodeIdServicesVariableOperation.go   |   4 +-
 .../OpcuaNodeIdServicesVariableOption.go      |   4 +-
 .../OpcuaNodeIdServicesVariableOrdered.go     |   4 +-
 .../OpcuaNodeIdServicesVariableOrientation.go |   4 +-
 .../OpcuaNodeIdServicesVariableOutput.go      |   4 +-
 .../OpcuaNodeIdServicesVariableOverride.go    |   4 +-
 .../OpcuaNodeIdServicesVariablePassword.go    |   4 +-
 .../OpcuaNodeIdServicesVariablePerform.go     |   4 +-
 .../OpcuaNodeIdServicesVariablePermission.go  |   4 +-
 .../OpcuaNodeIdServicesVariablePriority.go    |   4 +-
 .../OpcuaNodeIdServicesVariableProgram.go     |   4 +-
 .../OpcuaNodeIdServicesVariableProgress.go    |   4 +-
 ...pcuaNodeIdServicesVariableProvisionable.go |   4 +-
 .../model/OpcuaNodeIdServicesVariablePub.go   |   4 +-
 .../OpcuaNodeIdServicesVariablePublish.go     |   4 +-
 .../OpcuaNodeIdServicesVariablePublished.go   |   4 +-
 .../OpcuaNodeIdServicesVariableQuantities.go  |   4 +-
 .../OpcuaNodeIdServicesVariableQuantity.go    |   4 +-
 .../OpcuaNodeIdServicesVariableRational.go    |   4 +-
 .../model/OpcuaNodeIdServicesVariableRead.go  |   4 +-
 .../OpcuaNodeIdServicesVariableReader.go      |   4 +-
 .../OpcuaNodeIdServicesVariableRedundancy.go  |   4 +-
 .../OpcuaNodeIdServicesVariableRedundant.go   |   4 +-
 .../OpcuaNodeIdServicesVariableReference.go   |   4 +-
 .../OpcuaNodeIdServicesVariableRemove.go      |   4 +-
 .../OpcuaNodeIdServicesVariableRequest.go     |   4 +-
 .../OpcuaNodeIdServicesVariableResend.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableRole.go  |   4 +-
 .../OpcuaNodeIdServicesVariableSampling.go    |   4 +-
 .../OpcuaNodeIdServicesVariableSecurity.go    |   4 +-
 .../OpcuaNodeIdServicesVariableSelection.go   |   4 +-
 .../OpcuaNodeIdServicesVariableSemantic.go    |   4 +-
 .../OpcuaNodeIdServicesVariableServer.go      |   4 +-
 .../OpcuaNodeIdServicesVariableSession.go     |   4 +-
 .../OpcuaNodeIdServicesVariableSessions.go    |   4 +-
 .../model/OpcuaNodeIdServicesVariableSet.go   |   4 +-
 .../OpcuaNodeIdServicesVariableShelved.go     |   4 +-
 .../OpcuaNodeIdServicesVariableStandalone.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableState.go |   4 +-
 .../OpcuaNodeIdServicesVariableStructure.go   |   4 +-
 .../OpcuaNodeIdServicesVariableSubscribed.go  |   4 +-
 ...OpcuaNodeIdServicesVariableSubscription.go |   4 +-
 .../OpcuaNodeIdServicesVariableSyntax.go      |   4 +-
 .../OpcuaNodeIdServicesVariableSystem.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableTag.go   |   4 +-
 .../OpcuaNodeIdServicesVariableTarget.go      |   4 +-
 .../OpcuaNodeIdServicesVariableTemporary.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableThree.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableTimed.go |   4 +-
 .../OpcuaNodeIdServicesVariableTimestamps.go  |   4 +-
 .../OpcuaNodeIdServicesVariableTopics.go      |   4 +-
 .../OpcuaNodeIdServicesVariableTransaction.go |   4 +-
 .../OpcuaNodeIdServicesVariableTransition.go  |   4 +-
 .../OpcuaNodeIdServicesVariableTransparent.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableTrust.go |   4 +-
 .../model/OpcuaNodeIdServicesVariableTsn.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableTwo.go   |   4 +-
 .../model/OpcuaNodeIdServicesVariableType.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableUadp.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableUnit.go  |   4 +-
 .../OpcuaNodeIdServicesVariableUpdate.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableUser.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableValue.go |   4 +-
 .../OpcuaNodeIdServicesVariableVector.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableView.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableWell.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableWith.go  |   4 +-
 .../model/OpcuaNodeIdServicesVariableWrite.go |   4 +-
 .../OpcuaNodeIdServicesVariableWriter.go      |   4 +-
 .../model/OpcuaNodeIdServicesVariableX.go     |   4 +-
 .../model/OpcuaNodeIdServicesVariableY.go     |   4 +-
 .../opcua/readwrite/model/OpcuaOpenRequest.go |  36 +-
 .../readwrite/model/OpcuaOpenResponse.go      |  36 +-
 .../readwrite/model/OpcuaProtocolLimits.go    |   6 +-
 .../opcua/readwrite/model/OpcuaStatusCode.go  |   4 +-
 .../opcua/readwrite/model/OpcuaVector.go      |   4 +-
 .../readwrite/model/OpenChannelMessage.go     |   4 +-
 .../model/OpenChannelMessageRequest.go        |   6 +-
 .../model/OpenChannelMessageResponse.go       |   6 +-
 .../opcua/readwrite/model/OpenFileMode.go     |   4 +-
 .../model/OpenSecureChannelRequest.go         |  21 +-
 .../model/OpenSecureChannelResponse.go        |  36 +-
 .../opcua/readwrite/model/OptionSet.go        |   6 +-
 .../opcua/readwrite/model/Orientation.go      |   4 +-
 .../readwrite/model/OverrideValueHandling.go  |   4 +-
 .../opcua/readwrite/model/ParsingResult.go    |   6 +-
 .../opcua/readwrite/model/PascalByteString.go |   6 +-
 .../opcua/readwrite/model/PascalString.go     |   6 +-
 .../readwrite/model/PasswordOptionsMask.go    |   4 +-
 .../opcua/readwrite/model/Payload.go          |   6 +-
 .../readwrite/model/PerformUpdateType.go      |   4 +-
 .../opcua/readwrite/model/PermissionType.go   |   4 +-
 .../readwrite/model/PortableQualifiedName.go  |   6 +-
 .../model/PriorityMappingEntryType.go         |   6 +-
 .../model/ProgramDiagnostic2DataType.go       |   6 +-
 .../model/ProgramDiagnosticDataType.go        |  21 +-
 .../model/PubSubConfigurationDataType.go      |   6 +-
 .../model/PubSubConfigurationRefDataType.go   |   6 +-
 .../model/PubSubConfigurationRefMask.go       |   4 +-
 .../model/PubSubConnectionDataType.go         |  21 +-
 .../PubSubDiagnosticsCounterClassification.go |   4 +-
 .../readwrite/model/PubSubGroupDataType.go    |   6 +-
 .../model/PubSubKeyPushTargetDataType.go      |  21 +-
 .../opcua/readwrite/model/PubSubState.go      |   4 +-
 .../opcua/readwrite/model/PublishRequest.go   |  21 +-
 .../opcua/readwrite/model/PublishResponse.go  |  36 +-
 .../model/PublishedDataSetSourceDataType.go   |   4 +-
 .../model/PublishedVariableDataType.go        |  21 +-
 .../opcua/readwrite/model/QosDataType.go      |   4 +-
 .../opcua/readwrite/model/QualifiedName.go    |   6 +-
 .../readwrite/model/QuantityDimension.go      |   6 +-
 .../readwrite/model/QueryDataDescription.go   |  21 +-
 .../opcua/readwrite/model/QueryDataSet.go     |   6 +-
 .../readwrite/model/QueryFirstRequest.go      |  51 +-
 .../readwrite/model/QueryFirstResponse.go     |  36 +-
 .../opcua/readwrite/model/QueryNextRequest.go |  21 +-
 .../readwrite/model/QueryNextResponse.go      |  21 +-
 .../protocols/opcua/readwrite/model/Range.go  |   6 +-
 .../opcua/readwrite/model/RationalNumber.go   |   6 +-
 .../opcua/readwrite/model/ReadRequest.go      |  21 +-
 .../opcua/readwrite/model/ReadResponse.go     |  21 +-
 .../opcua/readwrite/model/ReadValueId.go      |   6 +-
 .../model/ReaderGroupMessageDataType.go       |   4 +-
 .../model/ReaderGroupTransportDataType.go     |   4 +-
 .../readwrite/model/RedundancySupport.go      |   4 +-
 .../model/RedundantServerDataType.go          |   6 +-
 .../readwrite/model/RedundantServerMode.go    |   4 +-
 .../readwrite/model/ReferenceDescription.go   |   6 +-
 .../model/ReferenceDescriptionDataType.go     |   6 +-
 .../model/ReferenceListEntryDataType.go       |   6 +-
 .../readwrite/model/RegisterNodesRequest.go   |  21 +-
 .../readwrite/model/RegisterNodesResponse.go  |  21 +-
 .../readwrite/model/RegisterServer2Request.go |  36 +-
 .../model/RegisterServer2Response.go          |  21 +-
 .../readwrite/model/RegisterServerRequest.go  |  36 +-
 .../readwrite/model/RegisterServerResponse.go |  21 +-
 .../opcua/readwrite/model/RegisteredServer.go |   6 +-
 .../opcua/readwrite/model/RelativePath.go     |   6 +-
 .../readwrite/model/RelativePathElement.go    |   6 +-
 .../opcua/readwrite/model/RepublishRequest.go |  21 +-
 .../readwrite/model/RepublishResponse.go      |  36 +-
 .../opcua/readwrite/model/RequestHeader.go    |   6 +-
 .../opcua/readwrite/model/ResponseHeader.go   |   6 +-
 .../readwrite/model/RolePermissionType.go     |   6 +-
 .../readwrite/model/RsaEncryptedSecret.go     |   4 +-
 .../SamplingIntervalDiagnosticsDataType.go    |   6 +-
 .../readwrite/model/SecurityGroupDataType.go  |   6 +-
 .../opcua/readwrite/model/SecurityHeader.go   |   6 +-
 .../model/SecurityTokenRequestType.go         |   4 +-
 .../model/SemanticChangeStructureDataType.go  |   6 +-
 .../readwrite/model/SemanticVersionString.go  |   4 +-
 .../opcua/readwrite/model/SequenceHeader.go   |   6 +-
 .../model/ServerDiagnosticsSummaryDataType.go |   6 +-
 .../opcua/readwrite/model/ServerOnNetwork.go  |   6 +-
 .../opcua/readwrite/model/ServerState.go      |   4 +-
 .../readwrite/model/ServerStatusDataType.go   |  21 +-
 .../readwrite/model/ServiceCounterDataType.go |   6 +-
 .../opcua/readwrite/model/ServiceFault.go     |  21 +-
 .../model/SessionAuthenticationToken.go       |   4 +-
 .../model/SessionDiagnosticsDataType.go       | 456 +-----------------
 .../SessionSecurityDiagnosticsDataType.go     |   6 +-
 .../model/SessionlessInvokeRequestType.go     |   6 +-
 .../model/SessionlessInvokeResponseType.go    |   6 +-
 .../model/SetMonitoringModeRequest.go         |  21 +-
 .../model/SetMonitoringModeResponse.go        |  21 +-
 .../model/SetPublishingModeRequest.go         |  21 +-
 .../model/SetPublishingModeResponse.go        |  21 +-
 .../readwrite/model/SetTriggeringRequest.go   |  21 +-
 .../readwrite/model/SetTriggeringResponse.go  |  21 +-
 .../opcua/readwrite/model/SignatureData.go    |   6 +-
 .../model/SignedSoftwareCertificate.go        |   6 +-
 .../model/StatusChangeNotification.go         |   6 +-
 .../opcua/readwrite/model/StatusCode.go       |   6 +-
 .../opcua/readwrite/model/StatusResult.go     |   6 +-
 .../opcua/readwrite/model/StringNodeId.go     |   6 +-
 .../opcua/readwrite/model/Structure.go        |   4 +-
 .../opcua/readwrite/model/StructureField.go   |   6 +-
 .../opcua/readwrite/model/StructureType.go    |   4 +-
 .../model/SubscribedDataSetDataType.go        |   4 +-
 .../model/SubscriptionAcknowledgement.go      |   6 +-
 .../model/SubscriptionDiagnosticsDataType.go  |   6 +-
 .../opcua/readwrite/model/TimeString.go       |   4 +-
 .../opcua/readwrite/model/TimeZoneDataType.go |   6 +-
 .../readwrite/model/TimestampsToReturn.go     |   4 +-
 .../readwrite/model/TransactionErrorType.go   |   6 +-
 .../opcua/readwrite/model/TransferResult.go   |   6 +-
 .../model/TransferSubscriptionsRequest.go     |  21 +-
 .../model/TransferSubscriptionsResponse.go    |  21 +-
 .../TranslateBrowsePathsToNodeIdsRequest.go   |  21 +-
 .../TranslateBrowsePathsToNodeIdsResponse.go  |  21 +-
 .../opcua/readwrite/model/TrimmedString.go    |   4 +-
 .../readwrite/model/TrustListDataType.go      |   6 +-
 .../opcua/readwrite/model/TrustListMasks.go   |   4 +-
 .../model/TrustListValidationOptions.go       |   4 +-
 .../opcua/readwrite/model/TsnFailureCode.go   |   4 +-
 .../readwrite/model/TsnListenerStatus.go      |   4 +-
 .../opcua/readwrite/model/TsnStreamState.go   |   4 +-
 .../opcua/readwrite/model/TsnTalkerStatus.go  |   4 +-
 .../opcua/readwrite/model/TwoByteNodeId.go    |   6 +-
 .../model/UadpDataSetMessageContentMask.go    |   4 +-
 .../model/UadpNetworkMessageContentMask.go    |   4 +-
 .../protocols/opcua/readwrite/model/Union.go  |   4 +-
 .../readwrite/model/UnregisterNodesRequest.go |  21 +-
 .../model/UnregisterNodesResponse.go          |  21 +-
 .../readwrite/model/UnsignedRationalNumber.go |   6 +-
 .../opcua/readwrite/model/UriString.go        |   4 +-
 .../readwrite/model/UserConfigurationMask.go  |   4 +-
 .../readwrite/model/UserIdentityToken.go      |  21 +-
 .../model/UserIdentityTokenDefinition.go      |   4 +-
 .../readwrite/model/UserManagementDataType.go |   6 +-
 .../readwrite/model/UserNameIdentityToken.go  |   6 +-
 .../opcua/readwrite/model/UserTokenPolicy.go  |   6 +-
 .../opcua/readwrite/model/UserTokenType.go    |   4 +-
 .../opcua/readwrite/model/UtcTime.go          |   4 +-
 .../opcua/readwrite/model/Variant.go          |   6 +-
 .../opcua/readwrite/model/VariantBoolean.go   |   6 +-
 .../opcua/readwrite/model/VariantByte.go      |   6 +-
 .../readwrite/model/VariantByteString.go      |   6 +-
 .../opcua/readwrite/model/VariantDataValue.go |   6 +-
 .../opcua/readwrite/model/VariantDateTime.go  |   6 +-
 .../readwrite/model/VariantDiagnosticInfo.go  |   6 +-
 .../opcua/readwrite/model/VariantDouble.go    |   6 +-
 .../readwrite/model/VariantExpandedNodeId.go  |   6 +-
 .../readwrite/model/VariantExtensionObject.go |   6 +-
 .../opcua/readwrite/model/VariantFloat.go     |   6 +-
 .../opcua/readwrite/model/VariantGuid.go      |   6 +-
 .../opcua/readwrite/model/VariantInt16.go     |   6 +-
 .../opcua/readwrite/model/VariantInt32.go     |   6 +-
 .../opcua/readwrite/model/VariantInt64.go     |   6 +-
 .../readwrite/model/VariantLocalizedText.go   |   6 +-
 .../opcua/readwrite/model/VariantNodeId.go    |   6 +-
 .../opcua/readwrite/model/VariantNull.go      |   4 +-
 .../readwrite/model/VariantQualifiedName.go   |   6 +-
 .../opcua/readwrite/model/VariantSByte.go     |   6 +-
 .../readwrite/model/VariantStatusCode.go      |   6 +-
 .../opcua/readwrite/model/VariantString.go    |   6 +-
 .../opcua/readwrite/model/VariantUInt16.go    |   6 +-
 .../opcua/readwrite/model/VariantUInt32.go    |   6 +-
 .../opcua/readwrite/model/VariantUInt64.go    |   6 +-
 .../opcua/readwrite/model/VariantVariant.go   |   6 +-
 .../readwrite/model/VariantXmlElement.go      |   6 +-
 .../opcua/readwrite/model/VersionTime.go      |   4 +-
 .../opcua/readwrite/model/ViewDescription.go  |   6 +-
 .../opcua/readwrite/model/WriteRequest.go     |  21 +-
 .../opcua/readwrite/model/WriteResponse.go    |  21 +-
 .../opcua/readwrite/model/WriteValue.go       |   6 +-
 .../model/WriterGroupMessageDataType.go       |   4 +-
 .../model/WriterGroupTransportDataType.go     |   4 +-
 .../readwrite/model/X509IdentityToken.go      |   6 +-
 .../protocols/opcua/readwrite/model/XVType.go |   6 +-
 .../opcua/readwrite/model/XmlElement.go       |   6 +-
 plc4go/protocols/s7/readwrite/ParserHelper.go |   3 +-
 .../protocols/s7/readwrite/XmlParserHelper.go |   3 +-
 .../readwrite/model/Alarm8MessageQueryType.go |   6 +-
 .../model/AlarmMessageAckObjectPushType.go    |   6 +-
 .../model/AlarmMessageAckPushType.go          |   6 +-
 .../model/AlarmMessageAckResponseType.go      |   6 +-
 .../s7/readwrite/model/AlarmMessageAckType.go |   6 +-
 .../model/AlarmMessageObjectAckType.go        |   6 +-
 .../model/AlarmMessageObjectPushType.go       |   6 +-
 .../model/AlarmMessageObjectQueryType.go      |   6 +-
 .../readwrite/model/AlarmMessagePushType.go   |   6 +-
 .../readwrite/model/AlarmMessageQueryType.go  |   6 +-
 .../s7/readwrite/model/AlarmStateType.go      |   4 +-
 .../protocols/s7/readwrite/model/AlarmType.go |   4 +-
 .../model/AssociatedQueryValueType.go         |   6 +-
 .../s7/readwrite/model/AssociatedValueType.go |   6 +-
 .../s7/readwrite/model/COTPPacket.go          |  21 +-
 .../model/COTPPacketConnectionRequest.go      |   6 +-
 .../model/COTPPacketConnectionResponse.go     |   6 +-
 .../s7/readwrite/model/COTPPacketData.go      |   6 +-
 .../model/COTPPacketDisconnectRequest.go      |   6 +-
 .../model/COTPPacketDisconnectResponse.go     |   6 +-
 .../s7/readwrite/model/COTPPacketTpduError.go |   6 +-
 .../s7/readwrite/model/COTPParameter.go       |   6 +-
 .../model/COTPParameterCalledTsap.go          |   6 +-
 .../model/COTPParameterCallingTsap.go         |   6 +-
 .../readwrite/model/COTPParameterChecksum.go  |   6 +-
 ...arameterDisconnectAdditionalInformation.go |   6 +-
 .../readwrite/model/COTPParameterTpduSize.go  |   6 +-
 .../s7/readwrite/model/COTPProtocolClass.go   |   4 +-
 .../s7/readwrite/model/COTPTpduSize.go        |   4 +-
 .../s7/readwrite/model/ControllerType.go      |   4 +-
 .../s7/readwrite/model/CpuSubscribeEvents.go  |   4 +-
 .../readwrite/model/CycServiceItemAnyType.go  |   6 +-
 .../model/CycServiceItemDbReadType.go         |   6 +-
 .../s7/readwrite/model/CycServiceItemType.go  |   6 +-
 .../protocols/s7/readwrite/model/DataItem.go  |   6 +-
 .../readwrite/model/DataTransportErrorCode.go |   4 +-
 .../s7/readwrite/model/DataTransportSize.go   |   4 +-
 .../s7/readwrite/model/DateAndTime.go         |   6 +-
 .../s7/readwrite/model/DeviceGroup.go         |   4 +-
 .../protocols/s7/readwrite/model/EventType.go |   4 +-
 .../s7/readwrite/model/MemoryArea.go          |   4 +-
 .../s7/readwrite/model/ModeTransitionType.go  |   4 +-
 .../protocols/s7/readwrite/model/QueryType.go |   4 +-
 .../protocols/s7/readwrite/model/S7Address.go |   6 +-
 .../s7/readwrite/model/S7AddressAny.go        |   6 +-
 .../s7/readwrite/model/S7DataAlarmMessage.go  |   6 +-
 .../protocols/s7/readwrite/model/S7Message.go |  36 +-
 .../readwrite/model/S7MessageObjectRequest.go |   6 +-
 .../model/S7MessageObjectResponse.go          |   6 +-
 .../s7/readwrite/model/S7MessageRequest.go    |   4 +-
 .../s7/readwrite/model/S7MessageResponse.go   |   6 +-
 .../readwrite/model/S7MessageResponseData.go  |   6 +-
 .../s7/readwrite/model/S7MessageUserData.go   |   4 +-
 .../s7/readwrite/model/S7Parameter.go         |   6 +-
 .../model/S7ParameterModeTransition.go        |   6 +-
 .../model/S7ParameterReadVarRequest.go        |   6 +-
 .../model/S7ParameterReadVarResponse.go       |   6 +-
 .../model/S7ParameterSetupCommunication.go    |   6 +-
 .../s7/readwrite/model/S7ParameterUserData.go |   6 +-
 .../model/S7ParameterUserDataItem.go          |   6 +-
 .../S7ParameterUserDataItemCPUFunctions.go    |   6 +-
 .../model/S7ParameterWriteVarRequest.go       |   6 +-
 .../model/S7ParameterWriteVarResponse.go      |   6 +-
 .../protocols/s7/readwrite/model/S7Payload.go |   4 +-
 .../s7/readwrite/model/S7PayloadAlarm8.go     |   6 +-
 .../readwrite/model/S7PayloadAlarmAckInd.go   |   6 +-
 .../s7/readwrite/model/S7PayloadAlarmS.go     |   6 +-
 .../s7/readwrite/model/S7PayloadAlarmSC.go    |   6 +-
 .../s7/readwrite/model/S7PayloadAlarmSQ.go    |   6 +-
 .../model/S7PayloadDiagnosticMessage.go       |   6 +-
 .../s7/readwrite/model/S7PayloadNotify.go     |   6 +-
 .../s7/readwrite/model/S7PayloadNotify8.go    |   6 +-
 .../model/S7PayloadReadVarResponse.go         |   6 +-
 .../s7/readwrite/model/S7PayloadUserData.go   |   6 +-
 .../readwrite/model/S7PayloadUserDataItem.go  |   6 +-
 .../model/S7PayloadUserDataItemClkFRequest.go |   4 +-
 .../S7PayloadUserDataItemClkFResponse.go      |   6 +-
 .../model/S7PayloadUserDataItemClkRequest.go  |   4 +-
 .../model/S7PayloadUserDataItemClkResponse.go |   6 +-
 .../S7PayloadUserDataItemClkSetRequest.go     |   6 +-
 .../S7PayloadUserDataItemClkSetResponse.go    |   4 +-
 ...ataItemCpuFunctionAlarmAckErrorResponse.go |   4 +-
 ...dUserDataItemCpuFunctionAlarmAckRequest.go |   6 +-
 ...UserDataItemCpuFunctionAlarmAckResponse.go |   6 +-
 ...serDataItemCpuFunctionAlarmQueryRequest.go |   6 +-
 ...erDataItemCpuFunctionAlarmQueryResponse.go |   6 +-
 ...CpuFunctionMsgSubscriptionAlarmResponse.go |   6 +-
 ...taItemCpuFunctionMsgSubscriptionRequest.go |   6 +-
 ...aItemCpuFunctionMsgSubscriptionResponse.go |   4 +-
 ...emCpuFunctionMsgSubscriptionSysResponse.go |   6 +-
 ...DataItemCpuFunctionReadSzlNoDataRequest.go |   4 +-
 ...adUserDataItemCpuFunctionReadSzlRequest.go |   6 +-
 ...dUserDataItemCpuFunctionReadSzlResponse.go |   6 +-
 ...rDataItemCyclicServicesChangeDrivenPush.go |   6 +-
 ...icServicesChangeDrivenSubscribeResponse.go |   6 +-
 ...UserDataItemCyclicServicesErrorResponse.go |   4 +-
 ...S7PayloadUserDataItemCyclicServicesPush.go |   6 +-
 ...rDataItemCyclicServicesSubscribeRequest.go |   6 +-
 ...DataItemCyclicServicesSubscribeResponse.go |   6 +-
 ...ataItemCyclicServicesUnsubscribeRequest.go |   6 +-
 ...taItemCyclicServicesUnsubscribeResponse.go |   4 +-
 .../model/S7PayloadWriteVarRequest.go         |   6 +-
 .../model/S7PayloadWriteVarResponse.go        |   6 +-
 .../readwrite/model/S7VarPayloadDataItem.go   |   8 +-
 .../readwrite/model/S7VarPayloadStatusItem.go |   6 +-
 .../model/S7VarRequestParameterItem.go        |   6 +-
 .../model/S7VarRequestParameterItemAddress.go |  21 +-
 plc4go/protocols/s7/readwrite/model/State.go  |   6 +-
 .../protocols/s7/readwrite/model/SubItem.go   |   6 +-
 .../s7/readwrite/model/SyntaxIdType.go        |   4 +-
 .../s7/readwrite/model/SzlDataTreeItem.go     |   6 +-
 plc4go/protocols/s7/readwrite/model/SzlId.go  |   6 +-
 .../s7/readwrite/model/SzlModuleTypeClass.go  |   4 +-
 .../s7/readwrite/model/SzlSublist.go          |   4 +-
 .../s7/readwrite/model/TPKTPacket.go          |  21 +-
 .../protocols/s7/readwrite/model/TimeBase.go  |   4 +-
 .../s7/readwrite/model/TransportSize.go       |   4 +-
 .../simulated/readwrite/ParserHelper.go       |   3 +-
 .../simulated/readwrite/XmlParserHelper.go    |   3 +-
 .../simulated/readwrite/model/DataItem.go     |   6 +-
 .../simulated/readwrite/model/Dummy.go        |   6 +-
 .../readwrite/model/SimulatedDataTypeSizes.go |   4 +-
 2986 files changed, 10639 insertions(+), 10435 deletions(-)

diff --git a/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
index f86d98c9266..0df9ff553bc 100644
--- a/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
@@ -345,7 +345,7 @@ type ${type.name}Builder interface {
 	<#assign typeRef=field.asTypedField().orElseThrow().type>
 	// With${field.name?cap_first} adds ${field.name?cap_first} (property field)
 	With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}(${helper.getLanguageTypeNameForTypeReference(typeRef, true)}) ${type.name}Builder
-	<#if typeRef.isComplexTypeReference()>
+	<#if typeRef.isComplexTypeReference() && !typeRef.asComplexTypeReference().orElseThrow().typeDefinition.isAbstract()>
 	// With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}Builder adds ${field.name?cap_first} (property field) which is build by the builder
 	With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}Builder(func(${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder)${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder) ${type.name}Builder
 	</#if>
@@ -395,7 +395,7 @@ func (m *_${type.name}Builder) With<#if field.isOptionalField()>Optional</#if>${
 	return m
 }
 
-	<#if typeRef.isComplexTypeReference()>
+	<#if typeRef.isComplexTypeReference() && !typeRef.asComplexTypeReference().orElseThrow().typeDefinition.isAbstract()>
 func (m *_${type.name}Builder) With<#if field.isOptionalField()>Optional</#if>${field.name?cap_first}Builder(builderSupplier func(${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder)${helper.getLanguageTypeNameForTypeReference(typeRef)}Builder) ${type.name}Builder {
 	builder:=builderSupplier(m.${field.name?cap_first}.Create${helper.getLanguageTypeNameForField(field)}Builder())
 	var err error
diff --git a/plc4go/internal/ads/Subscriber.go b/plc4go/internal/ads/Subscriber.go
index 2949fcbd249..5f32f4435c9 100644
--- a/plc4go/internal/ads/Subscriber.go
+++ b/plc4go/internal/ads/Subscriber.go
@@ -21,7 +21,6 @@ package ads
 
 import (
 	"context"
-	"errors"
 	"runtime/debug"
 	"time"
 
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ComplexAckPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ComplexAckPDU.go
index df9ee03707c..ba1e97cb4e2 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ComplexAckPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ComplexAckPDU.go
@@ -28,6 +28,10 @@ type ComplexAckPDU struct {
 
 var _ readWriteModel.APDUComplexAck = (*ComplexAckPDU)(nil)
 
+func (c *ComplexAckPDU) CreateAPDUComplexAckBuilder() readWriteModel.APDUComplexAckBuilder {
+	panic("implement me")
+}
+
 func (c *ComplexAckPDU) GetSegmentedMessage() bool {
 	//TODO implement me
 	panic("implement me")
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
index 57c03897e32..f756ed695ac 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ConfirmedRequestPDU.go
@@ -86,6 +86,11 @@ func (c *ConfirmedRequestPDU) buildConfirmedRequest(serviceRequest readWriteMode
 	)
 }
 
+func (c *ConfirmedRequestPDU) CreateAPDUConfirmedRequestBuilder() readWriteModel.APDUConfirmedRequestBuilder {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (c *ConfirmedRequestPDU) GetSegmentedMessage() bool {
 	return c.apduSeg
 }
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
index 8bdbb9b68c5..cc55cfd36a1 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_ErrorPDU.go
@@ -88,6 +88,11 @@ func (e *ErrorPDU) buildConfirmedRequest(bacnetError readWriteModel.BACnetError)
 	)
 }
 
+func (e *ErrorPDU) CreateAPDUErrorBuilder() readWriteModel.APDUErrorBuilder {
+	//TODO implement me
+	panic("implement me")
+}
+
 func (e *ErrorPDU) GetSegmentedMessage() bool {
 	return e.apduSeg
 }
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_SimpleAckPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_SimpleAckPDU.go
index 1e87bdacdcd..6d2e8e87ada 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_SimpleAckPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_SimpleAckPDU.go
@@ -28,6 +28,10 @@ type SimpleAckPDU struct {
 
 var _ readWriteModel.APDUComplexAck = (*SimpleAckPDU)(nil)
 
+func (s *SimpleAckPDU) CreateAPDUComplexAckBuilder() readWriteModel.APDUComplexAckBuilder {
+	panic("implement me")
+}
+
 func (s *SimpleAckPDU) GetSegmentedMessage() bool {
 	//TODO implement me
 	panic("implement me")
diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
index d30bb00495c..c068e1975bd 100644
--- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
+++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestPDU.go
@@ -68,6 +68,10 @@ func (u *UnconfirmedRequestPDU) buildUnconfirmedServiceRequest(serviceRequest re
 	return readWriteModel.NewAPDUUnconfirmedRequest(serviceRequest, 0)
 }
 
+func (u *UnconfirmedRequestPDU) CreateAPDUUnconfirmedRequestBuilder() readWriteModel.APDUUnconfirmedRequestBuilder {
+	panic("implement me")
+}
+
 func (u *UnconfirmedRequestPDU) GetServiceRequest() readWriteModel.BACnetUnconfirmedServiceRequest {
 	return u.serviceRequest
 }
diff --git a/plc4go/protocols/abeth/readwrite/ParserHelper.go b/plc4go/protocols/abeth/readwrite/ParserHelper.go
index 76092c7cec6..f906d2e999a 100644
--- a/plc4go/protocols/abeth/readwrite/ParserHelper.go
+++ b/plc4go/protocols/abeth/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/XmlParserHelper.go b/plc4go/protocols/abeth/readwrite/XmlParserHelper.go
index 83f579220be..cffba92bf70 100644
--- a/plc4go/protocols/abeth/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/abeth/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
index b0dc3d38dde..d4a8eefd426 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
index 2909c1ebd15..1c1b6f4bf4d 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
index ecfef52a2fb..7d6737a57b8 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationPacket.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadRequest.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadRequest.go
index 4f584656a00..447b212157e 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadRequest.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type CIPEncapsulationReadRequestBuilder interface {
 	WithMandatoryFields(request DF1RequestMessage) CIPEncapsulationReadRequestBuilder
 	// WithRequest adds Request (property field)
 	WithRequest(DF1RequestMessage) CIPEncapsulationReadRequestBuilder
-	// WithRequestBuilder adds Request (property field) which is build by the builder
-	WithRequestBuilder(func(DF1RequestMessageBuilder) DF1RequestMessageBuilder) CIPEncapsulationReadRequestBuilder
 	// Build builds the CIPEncapsulationReadRequest or returns an error if something is wrong
 	Build() (CIPEncapsulationReadRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_CIPEncapsulationReadRequestBuilder) WithRequest(request DF1RequestMess
 	return m
 }
 
-func (m *_CIPEncapsulationReadRequestBuilder) WithRequestBuilder(builderSupplier func(DF1RequestMessageBuilder) DF1RequestMessageBuilder) CIPEncapsulationReadRequestBuilder {
-	builder := builderSupplier(m.Request.CreateDF1RequestMessageBuilder())
-	var err error
-	m.Request, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "DF1RequestMessageBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CIPEncapsulationReadRequestBuilder) Build() (CIPEncapsulationReadRequest, error) {
 	if m.Request == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
index 1e9b9196e15..257cb353201 100644
--- a/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
+++ b/plc4go/protocols/abeth/readwrite/model/CIPEncapsulationReadResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -85,8 +87,6 @@ type CIPEncapsulationReadResponseBuilder interface {
 	WithMandatoryFields(response DF1ResponseMessage) CIPEncapsulationReadResponseBuilder
 	// WithResponse adds Response (property field)
 	WithResponse(DF1ResponseMessage) CIPEncapsulationReadResponseBuilder
-	// WithResponseBuilder adds Response (property field) which is build by the builder
-	WithResponseBuilder(func(DF1ResponseMessageBuilder) DF1ResponseMessageBuilder) CIPEncapsulationReadResponseBuilder
 	// Build builds the CIPEncapsulationReadResponse or returns an error if something is wrong
 	Build() (CIPEncapsulationReadResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -115,19 +115,6 @@ func (m *_CIPEncapsulationReadResponseBuilder) WithResponse(response DF1Response
 	return m
 }
 
-func (m *_CIPEncapsulationReadResponseBuilder) WithResponseBuilder(builderSupplier func(DF1ResponseMessageBuilder) DF1ResponseMessageBuilder) CIPEncapsulationReadResponseBuilder {
-	builder := builderSupplier(m.Response.CreateDF1ResponseMessageBuilder())
-	var err error
-	m.Response, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "DF1ResponseMessageBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CIPEncapsulationReadResponseBuilder) Build() (CIPEncapsulationReadResponse, error) {
 	if m.Response == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1CommandRequestMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1CommandRequestMessage.go
index 6de9583e743..7ae608be34a 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1CommandRequestMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1CommandRequestMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type DF1CommandRequestMessageBuilder interface {
 	WithMandatoryFields(command DF1RequestCommand) DF1CommandRequestMessageBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(DF1RequestCommand) DF1CommandRequestMessageBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(DF1RequestCommandBuilder) DF1RequestCommandBuilder) DF1CommandRequestMessageBuilder
 	// Build builds the DF1CommandRequestMessage or returns an error if something is wrong
 	Build() (DF1CommandRequestMessage, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_DF1CommandRequestMessageBuilder) WithCommand(command DF1RequestCommand
 	return m
 }
 
-func (m *_DF1CommandRequestMessageBuilder) WithCommandBuilder(builderSupplier func(DF1RequestCommandBuilder) DF1RequestCommandBuilder) DF1CommandRequestMessageBuilder {
-	builder := builderSupplier(m.Command.CreateDF1RequestCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "DF1RequestCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DF1CommandRequestMessageBuilder) Build() (DF1CommandRequestMessage, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index 5f7a83bef10..c7f512bf810 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
index 85a25679efa..a827530b09e 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
index 06bff80cb08..80193b4bfca 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go b/plc4go/protocols/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
index 41cb77ff52c..b77b6fa3107 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
index 0f67bf15b9a..0035236c8d2 100644
--- a/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/protocols/abeth/readwrite/model/DF1ResponseMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go b/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
index 4e5a0e28cbc..00c6b44047a 100644
--- a/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
+++ b/plc4go/protocols/ads/discovery/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/ads/discovery/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go b/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
index 4966edb17d3..0617588c59c 100644
--- a/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/ads/discovery/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/ads/discovery/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
index 33a55f2bcec..8f8c4370b9f 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscovery.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
index 42e3b77d2e7..9870c2eec79 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockAmsNetId.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockAmsNetId.go
index 8baf434b44f..1eacaea9b0b 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockAmsNetId.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockAmsNetId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockFingerprint.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockFingerprint.go
index 2a21852ab3e..0db261a93d7 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockFingerprint.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockFingerprint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockHostName.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockHostName.go
index 3dd683177b1..7690374cfdc 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockHostName.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockHostName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockOsData.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockOsData.go
index c9800d59110..a47c79f1345 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockOsData.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockOsData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockPassword.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockPassword.go
index 5cc3e76c840..f5e64af6421 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockPassword.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockPassword.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockRouteName.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockRouteName.go
index 5dc57ee1603..7fdc1d81aa9 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockRouteName.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockRouteName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockStatus.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockStatus.go
index 32dae17b8dc..a69fecba2ba 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockStatus.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockType.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockType.go
index 7f660a63ecc..dcc0732211a 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockType.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockUserName.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockUserName.go
index 67ab817502d..de5545e90eb 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockUserName.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockUserName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockVersion.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockVersion.go
index 4c9c1d5b491..8b70711ddd0 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockVersion.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryBlockVersion.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryConstants.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryConstants.go
index fc41e36d860..757cc9360bc 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryConstants.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsDiscoveryConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AdsPortNumbers.go b/plc4go/protocols/ads/discovery/readwrite/model/AdsPortNumbers.go
index e7e49deeeb2..778e0700782 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AdsPortNumbers.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AdsPortNumbers.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go b/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
index 7debb8c8ae3..b3d00bbe008 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AmsNetId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go b/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
index 69b4d6e6d4e..e47e0b25480 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/AmsString.go
@@ -22,12 +22,14 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/Operation.go b/plc4go/protocols/ads/discovery/readwrite/model/Operation.go
index 1806d80e688..2dfecb8c2d5 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/Operation.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/Operation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/discovery/readwrite/model/Status.go b/plc4go/protocols/ads/discovery/readwrite/model/Status.go
index 7218c3982ce..7c70cb971dd 100644
--- a/plc4go/protocols/ads/discovery/readwrite/model/Status.go
+++ b/plc4go/protocols/ads/discovery/readwrite/model/Status.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/ParserHelper.go b/plc4go/protocols/ads/readwrite/ParserHelper.go
index c1e93471a4b..50fdbe34b6c 100644
--- a/plc4go/protocols/ads/readwrite/ParserHelper.go
+++ b/plc4go/protocols/ads/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/XmlParserHelper.go b/plc4go/protocols/ads/readwrite/XmlParserHelper.go
index 294f113a7db..124aaf7ae1b 100644
--- a/plc4go/protocols/ads/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/ads/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
index 83cf9ba21f2..e08b110896d 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationResponse.go b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
index a1bac212c51..c560aa90f2f 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsConstants.go b/plc4go/protocols/ads/readwrite/model/AdsConstants.go
index 00c74313cff..0d6c3fcad29 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsConstants.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataType.go b/plc4go/protocols/ads/readwrite/model/AdsDataType.go
index f10ec390473..744f89cadfc 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataType.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
index 3258492af98..78970128523 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeArrayInfo.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
index 694c40b2069..71797fa3d34 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableChildEntry.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
index fbebfa4ce6c..28c5212a112 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDataTypeTableEntry.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go b/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
index 9e3a18b62a0..28169d7b581 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go b/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
index 16faf0d6479..0e11b61e5f2 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationRequest.go b/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationRequest.go
index 54089dd3da4..7031f9c7e6b 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationResponse.go b/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationResponse.go
index d301cf0f83b..31ebaf2bd4d 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsDeviceNotificationResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsInvalidRequest.go b/plc4go/protocols/ads/readwrite/model/AdsInvalidRequest.go
index 3b780283bb9..8b77fc9f01c 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsInvalidRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsInvalidRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsInvalidResponse.go b/plc4go/protocols/ads/readwrite/model/AdsInvalidResponse.go
index 847137c5669..16a853f7550 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsInvalidResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsInvalidResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
index f88d21bc112..6e9bb873f66 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItem.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemRead.go b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemRead.go
index 5c55812f469..36ac47ccdd8 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemRead.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemReadWrite.go b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
index 0edce992ae7..471904ab913 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemWrite.go b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemWrite.go
index f97dcf9601e..c0d6177c909 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemWrite.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsMultiRequestItemWrite.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go b/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
index 7a286b95c4e..524ba2786bb 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsNotificationSample.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoRequest.go b/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoRequest.go
index 3693da39c67..26ae34ba8f6 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoResponse.go b/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoResponse.go
index dcaefa0421e..0c525204b84 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadDeviceInfoResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadRequest.go b/plc4go/protocols/ads/readwrite/model/AdsReadRequest.go
index d7e9e79db60..14d1c82dcdb 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadResponse.go b/plc4go/protocols/ads/readwrite/model/AdsReadResponse.go
index ad402488a02..3a8c49fd0c0 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadStateRequest.go b/plc4go/protocols/ads/readwrite/model/AdsReadStateRequest.go
index 4ba824071e5..5638f5c3a73 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadStateRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadStateRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadStateResponse.go b/plc4go/protocols/ads/readwrite/model/AdsReadStateResponse.go
index fd6e4b24eb2..aaa973ef4d9 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadStateResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadStateResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadWriteRequest.go b/plc4go/protocols/ads/readwrite/model/AdsReadWriteRequest.go
index c6be6c696ae..9e1d80639d9 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadWriteRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadWriteRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsReadWriteResponse.go b/plc4go/protocols/ads/readwrite/model/AdsReadWriteResponse.go
index 210ff701cac..e467c58f9f5 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsReadWriteResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsReadWriteResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go b/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
index b12847acad1..8bf32270131 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsStampHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
index 0b6e451ef23..dfe0728dc49 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsSymbolTableEntry.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go b/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
index fa84e0f51f3..5f210494c4b 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsTableSizes.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsTransMode.go b/plc4go/protocols/ads/readwrite/model/AdsTransMode.go
index 424c1103930..945f1eb80e8 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsTransMode.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsTransMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsWriteControlRequest.go b/plc4go/protocols/ads/readwrite/model/AdsWriteControlRequest.go
index b3865e9fcb5..7d2b6eebc93 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsWriteControlRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsWriteControlRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsWriteControlResponse.go b/plc4go/protocols/ads/readwrite/model/AdsWriteControlResponse.go
index b7a2d4d1cd0..bc6386e2eb1 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsWriteControlResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsWriteControlResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsWriteRequest.go b/plc4go/protocols/ads/readwrite/model/AdsWriteRequest.go
index 96f9a894470..7ad3bdc9c35 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsWriteRequest.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsWriteRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AdsWriteResponse.go b/plc4go/protocols/ads/readwrite/model/AdsWriteResponse.go
index 7b61c7eeece..03b6fdd23ed 100644
--- a/plc4go/protocols/ads/readwrite/model/AdsWriteResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/AdsWriteResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AmsNetId.go b/plc4go/protocols/ads/readwrite/model/AmsNetId.go
index 7debb8c8ae3..b3d00bbe008 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsNetId.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsNetId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AmsPacket.go b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
index 2b59d56a4f1..b02b9825b7f 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsPacket.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
index 6b77bb99061..ba087fc87bd 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
index bdf0d7af892..27bace51af1 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialFrame.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -100,8 +102,6 @@ type AmsSerialFrameBuilder interface {
 	WithLength(int8) AmsSerialFrameBuilder
 	// WithUserdata adds Userdata (property field)
 	WithUserdata(AmsPacket) AmsSerialFrameBuilder
-	// WithUserdataBuilder adds Userdata (property field) which is build by the builder
-	WithUserdataBuilder(func(AmsPacketBuilder) AmsPacketBuilder) AmsSerialFrameBuilder
 	// WithCrc adds Crc (property field)
 	WithCrc(uint16) AmsSerialFrameBuilder
 	// Build builds the AmsSerialFrame or returns an error if something is wrong
@@ -157,19 +157,6 @@ func (m *_AmsSerialFrameBuilder) WithUserdata(userdata AmsPacket) AmsSerialFrame
 	return m
 }
 
-func (m *_AmsSerialFrameBuilder) WithUserdataBuilder(builderSupplier func(AmsPacketBuilder) AmsPacketBuilder) AmsSerialFrameBuilder {
-	builder := builderSupplier(m.Userdata.CreateAmsPacketBuilder())
-	var err error
-	m.Userdata, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "AmsPacketBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AmsSerialFrameBuilder) WithCrc(crc uint16) AmsSerialFrameBuilder {
 	m.Crc = crc
 	return m
diff --git a/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go b/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
index 229fa8e33f2..a6e96c6de93 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsSerialResetFrame.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
index 4759699fe6d..bee4da6601f 100644
--- a/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
+++ b/plc4go/protocols/ads/readwrite/model/AmsTCPPacket.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -76,8 +78,6 @@ type AmsTCPPacketBuilder interface {
 	WithMandatoryFields(userdata AmsPacket) AmsTCPPacketBuilder
 	// WithUserdata adds Userdata (property field)
 	WithUserdata(AmsPacket) AmsTCPPacketBuilder
-	// WithUserdataBuilder adds Userdata (property field) which is build by the builder
-	WithUserdataBuilder(func(AmsPacketBuilder) AmsPacketBuilder) AmsTCPPacketBuilder
 	// Build builds the AmsTCPPacket or returns an error if something is wrong
 	Build() (AmsTCPPacket, error)
 	// MustBuild does the same as Build but panics on error
@@ -106,19 +106,6 @@ func (m *_AmsTCPPacketBuilder) WithUserdata(userdata AmsPacket) AmsTCPPacketBuil
 	return m
 }
 
-func (m *_AmsTCPPacketBuilder) WithUserdataBuilder(builderSupplier func(AmsPacketBuilder) AmsPacketBuilder) AmsTCPPacketBuilder {
-	builder := builderSupplier(m.Userdata.CreateAmsPacketBuilder())
-	var err error
-	m.Userdata, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "AmsPacketBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AmsTCPPacketBuilder) Build() (AmsTCPPacket, error) {
 	if m.Userdata == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/ads/readwrite/model/CommandId.go b/plc4go/protocols/ads/readwrite/model/CommandId.go
index ee98d66c762..0443491b2ab 100644
--- a/plc4go/protocols/ads/readwrite/model/CommandId.go
+++ b/plc4go/protocols/ads/readwrite/model/CommandId.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/DataItem.go b/plc4go/protocols/ads/readwrite/model/DataItem.go
index 6875c515331..18199ebd24b 100644
--- a/plc4go/protocols/ads/readwrite/model/DataItem.go
+++ b/plc4go/protocols/ads/readwrite/model/DataItem.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/DefaultAmsPorts.go b/plc4go/protocols/ads/readwrite/model/DefaultAmsPorts.go
index cf13cc8e3b5..8c84d99abe0 100644
--- a/plc4go/protocols/ads/readwrite/model/DefaultAmsPorts.go
+++ b/plc4go/protocols/ads/readwrite/model/DefaultAmsPorts.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/ErrorResponse.go b/plc4go/protocols/ads/readwrite/model/ErrorResponse.go
index 3727122955e..36710d58c7c 100644
--- a/plc4go/protocols/ads/readwrite/model/ErrorResponse.go
+++ b/plc4go/protocols/ads/readwrite/model/ErrorResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/PlcValueType.go b/plc4go/protocols/ads/readwrite/model/PlcValueType.go
index f5db823dcd5..a7d553d6ddc 100644
--- a/plc4go/protocols/ads/readwrite/model/PlcValueType.go
+++ b/plc4go/protocols/ads/readwrite/model/PlcValueType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go b/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
index 78ca9e91394..cb55a1566e6 100644
--- a/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
+++ b/plc4go/protocols/ads/readwrite/model/ReservedIndexGroups.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/ads/readwrite/model/ReturnCode.go b/plc4go/protocols/ads/readwrite/model/ReturnCode.go
index cc0e05e7c8c..8497e84410c 100644
--- a/plc4go/protocols/ads/readwrite/model/ReturnCode.go
+++ b/plc4go/protocols/ads/readwrite/model/ReturnCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/ParserHelper.go b/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
index def67310964..ff36f50cb20 100644
--- a/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/bacnetip/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go b/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
index 718abcaaf2f..e6275e708f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/bacnetip/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDU.go b/plc4go/protocols/bacnetip/readwrite/model/APDU.go
index 718481e5a37..514d811de56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDU.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
index ad443a3b6a3..ff3b1a404a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUAbort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
index 03680c4a9fd..e645594202a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUComplexAck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -121,8 +123,6 @@ type APDUComplexAckBuilder interface {
 	WithOptionalProposedWindowSize(uint8) APDUComplexAckBuilder
 	// WithServiceAck adds ServiceAck (property field)
 	WithOptionalServiceAck(BACnetServiceAck) APDUComplexAckBuilder
-	// WithOptionalServiceAckBuilder adds ServiceAck (property field) which is build by the builder
-	WithOptionalServiceAckBuilder(func(BACnetServiceAckBuilder) BACnetServiceAckBuilder) APDUComplexAckBuilder
 	// WithSegmentServiceChoice adds SegmentServiceChoice (property field)
 	WithOptionalSegmentServiceChoice(BACnetConfirmedServiceChoice) APDUComplexAckBuilder
 	// WithSegment adds Segment (property field)
@@ -180,19 +180,6 @@ func (m *_APDUComplexAckBuilder) WithOptionalServiceAck(serviceAck BACnetService
 	return m
 }
 
-func (m *_APDUComplexAckBuilder) WithOptionalServiceAckBuilder(builderSupplier func(BACnetServiceAckBuilder) BACnetServiceAckBuilder) APDUComplexAckBuilder {
-	builder := builderSupplier(m.ServiceAck.CreateBACnetServiceAckBuilder())
-	var err error
-	m.ServiceAck, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetServiceAckBuilder failed"))
-	}
-	return m
-}
-
 func (m *_APDUComplexAckBuilder) WithOptionalSegmentServiceChoice(segmentServiceChoice BACnetConfirmedServiceChoice) APDUComplexAckBuilder {
 	m.SegmentServiceChoice = &segmentServiceChoice
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
index cc864e4e6ed..7755117b0d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -139,8 +141,6 @@ type APDUConfirmedRequestBuilder interface {
 	WithOptionalProposedWindowSize(uint8) APDUConfirmedRequestBuilder
 	// WithServiceRequest adds ServiceRequest (property field)
 	WithOptionalServiceRequest(BACnetConfirmedServiceRequest) APDUConfirmedRequestBuilder
-	// WithOptionalServiceRequestBuilder adds ServiceRequest (property field) which is build by the builder
-	WithOptionalServiceRequestBuilder(func(BACnetConfirmedServiceRequestBuilder) BACnetConfirmedServiceRequestBuilder) APDUConfirmedRequestBuilder
 	// WithSegmentServiceChoice adds SegmentServiceChoice (property field)
 	WithOptionalSegmentServiceChoice(BACnetConfirmedServiceChoice) APDUConfirmedRequestBuilder
 	// WithSegment adds Segment (property field)
@@ -213,19 +213,6 @@ func (m *_APDUConfirmedRequestBuilder) WithOptionalServiceRequest(serviceRequest
 	return m
 }
 
-func (m *_APDUConfirmedRequestBuilder) WithOptionalServiceRequestBuilder(builderSupplier func(BACnetConfirmedServiceRequestBuilder) BACnetConfirmedServiceRequestBuilder) APDUConfirmedRequestBuilder {
-	builder := builderSupplier(m.ServiceRequest.CreateBACnetConfirmedServiceRequestBuilder())
-	var err error
-	m.ServiceRequest, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConfirmedServiceRequestBuilder failed"))
-	}
-	return m
-}
-
 func (m *_APDUConfirmedRequestBuilder) WithOptionalSegmentServiceChoice(segmentServiceChoice BACnetConfirmedServiceChoice) APDUConfirmedRequestBuilder {
 	m.SegmentServiceChoice = &segmentServiceChoice
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
index b92071be2a1..619c640b83b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type APDUErrorBuilder interface {
 	WithErrorChoice(BACnetConfirmedServiceChoice) APDUErrorBuilder
 	// WithError adds Error (property field)
 	WithError(BACnetError) APDUErrorBuilder
-	// WithErrorBuilder adds Error (property field) which is build by the builder
-	WithErrorBuilder(func(BACnetErrorBuilder) BACnetErrorBuilder) APDUErrorBuilder
 	// Build builds the APDUError or returns an error if something is wrong
 	Build() (APDUError, error)
 	// MustBuild does the same as Build but panics on error
@@ -134,19 +134,6 @@ func (m *_APDUErrorBuilder) WithError(error BACnetError) APDUErrorBuilder {
 	return m
 }
 
-func (m *_APDUErrorBuilder) WithErrorBuilder(builderSupplier func(BACnetErrorBuilder) BACnetErrorBuilder) APDUErrorBuilder {
-	builder := builderSupplier(m.Error.CreateBACnetErrorBuilder())
-	var err error
-	m.Error, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetErrorBuilder failed"))
-	}
-	return m
-}
-
 func (m *_APDUErrorBuilder) Build() (APDUError, error) {
 	if m.Error == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
index 98d2a3e1201..8789de3504f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUReject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
index 3d9f386ebc6..2b069db1d5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
index 15996f3bdcc..f30ba587a71 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 2ce8e37d023..a90dfd6a074 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type APDUUnconfirmedRequestBuilder interface {
 	WithMandatoryFields(serviceRequest BACnetUnconfirmedServiceRequest) APDUUnconfirmedRequestBuilder
 	// WithServiceRequest adds ServiceRequest (property field)
 	WithServiceRequest(BACnetUnconfirmedServiceRequest) APDUUnconfirmedRequestBuilder
-	// WithServiceRequestBuilder adds ServiceRequest (property field) which is build by the builder
-	WithServiceRequestBuilder(func(BACnetUnconfirmedServiceRequestBuilder) BACnetUnconfirmedServiceRequestBuilder) APDUUnconfirmedRequestBuilder
 	// Build builds the APDUUnconfirmedRequest or returns an error if something is wrong
 	Build() (APDUUnconfirmedRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_APDUUnconfirmedRequestBuilder) WithServiceRequest(serviceRequest BACne
 	return m
 }
 
-func (m *_APDUUnconfirmedRequestBuilder) WithServiceRequestBuilder(builderSupplier func(BACnetUnconfirmedServiceRequestBuilder) BACnetUnconfirmedServiceRequestBuilder) APDUUnconfirmedRequestBuilder {
-	builder := builderSupplier(m.ServiceRequest.CreateBACnetUnconfirmedServiceRequestBuilder())
-	var err error
-	m.ServiceRequest, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetUnconfirmedServiceRequestBuilder failed"))
-	}
-	return m
-}
-
 func (m *_APDUUnconfirmedRequestBuilder) Build() (APDUUnconfirmedRequest, error) {
 	if m.ServiceRequest == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
index 3c6645f3987..8ff2990a032 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/APDUUnknown.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ApduType.go b/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
index 964a56fdd61..2c05b8cd63f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ApduType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
index 95a17327d87..2df46b7392f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
index f769bf6f9b9..7ab91ba0b2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAbortReasonTagged.go
@@ -22,10 +22,12 @@ package model
 import (
 	"context"
 	"fmt"
-	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
index 3881839690f..24dead340d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
index a19a484168c..b4e19739f5a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessAuthenticationFactorDisableTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
index df3eaa2f6e1..6436a295abb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
index 97df87d9131..8ab8d409b4f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
index cf20785263b..167c6234fd2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableReasonTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
index ec74c7e5351..4b56d050f91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessCredentialDisableTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
index 4d63805b93b..0edc2509634 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEvent.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
index 3f0693edd3c..fa245a09825 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessEventTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
index d21fac26d31..b056590cc96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
index de1eebedd30..e8e01c2a9de 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessPassbackModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
index d9d6019d50b..5ff588bf182 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRule.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
index 1b24426f611..4030fd4cbb2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifier.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
index b10af26e9ce..c4f3e11fabf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleLocationSpecifierTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
index b4aca7e886b..af28d57899b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifier.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
index aefd9aaf07c..c3a2300be45 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessRuleTimeRangeSpecifierTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
index 334a3658879..0910653e4b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessThreatLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
index 2132195bcf2..7ccfcb3ce38 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
index 7df7b3ebed6..0fbfa343dde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessUserTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
index 68d68eab849..d0e43da87b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
index 12ac2ac9c4b..715cf257cad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccessZoneOccupancyStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
index 93322594119..3d71356b384 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
index abe6f145329..c966ec1e5c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
index 7b400df5a77..d7a7f26130b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAccumulatorRecordAccumulatorStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
index 98fb0e798de..2fb4cf1cf24 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAction.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
index b4235dfba67..8ac61920296 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -121,8 +123,6 @@ type BACnetActionCommandBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetActionCommandBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithOptionalPropertyValue(BACnetConstructedData) BACnetActionCommandBuilder
-	// WithOptionalPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithOptionalPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetActionCommandBuilder
 	// WithPriority adds Priority (property field)
 	WithOptionalPriority(BACnetContextTagUnsignedInteger) BACnetActionCommandBuilder
 	// WithOptionalPriorityBuilder adds Priority (property field) which is build by the builder
@@ -239,19 +239,6 @@ func (m *_BACnetActionCommandBuilder) WithOptionalPropertyValue(propertyValue BA
 	return m
 }
 
-func (m *_BACnetActionCommandBuilder) WithOptionalPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetActionCommandBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetActionCommandBuilder) WithOptionalPriority(priority BACnetContextTagUnsignedInteger) BACnetActionCommandBuilder {
 	m.Priority = priority
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
index 23db2a27141..4a64a2a2bc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
index 850a99d1be0..cc1bd188e49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetActionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
index 38566afb13e..82146ff3fd1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
index 0e1e62171e1..c497570faf2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressBinding.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
index dbe09318fb9..0ca9210536a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAddressEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
index 396f2565314..12988a9611b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
index 670a8377cf2..9bfac74ba70 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
index 197cd058e7f..7b1b2cf99db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
index 13b98521383..d99222ebc55 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDate.go
index 1b55cec3258..23260d9a932 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
index 29434fd25b0..5b7a88ea060 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
index f772c6ab40d..1b074e99f7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagNull.go
index 58c11341746..311cc129872 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagNull.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
index 76f533fb4ed..a52ca284d5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
index f40ea5a2012..84afaf8a07a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagReal.go
index a158b700c0a..4be6e2bdfc4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
index c425e11c27f..976ceaafba5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagTime.go
index 950e33f107f..0d9dcccf49b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
index 055ab07b1da..b96fec02bae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
index b4366606d59..5878e070e9e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedAccessRights.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
index c00434ec48d..ed6e17704f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCalls.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
index 805caf96c23..ac309fcf1e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
index 34fcc8f107d..fe72d23239f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAssignedLandingCallsLandingCallsListEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
index 83ce9ea892e..3172dade35e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactor.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
index 5a4af70e846..381f9d9511f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
index add2e4ff84d..8ccc3c10b0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorFormat.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
index f9071a905b5..e017acdb38d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
index 161b277c85a..15c8908002d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationFactorTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
index 21cdd576e5e..559fec513b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicy.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
index 4ca4e1df6f4..e366d4faa0c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
index 04f6ed54841..7eff41de6b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationPolicyListEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
index 40016505f86..b1eb793c716 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
index 9ba2901feeb..4accf6ee5ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthenticationStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
index 8d6aabeada4..d51cab9c778 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemption.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
index 4bd9fd0efe5..3d7291cb956 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationExemptionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
index c3ac6ca7390..246525584bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
index f064e3ba691..018c514cf2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetAuthorizationModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
index cd65e04c004..61403994e11 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBDTEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
index 99f19926579..80967d74803 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
index 962320b608b..e33bad5ea9b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBackupStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
index 47c8285c11f..c9b5d7286d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPV.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
index cbe44160032..9e7d12f02e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryLightingPVTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
index 99ad363d8a4..140c09ae814 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPV.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
index c9fe95a5391..a5419c4fa9f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetBinaryPVTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
index 93da4b4747c..2c3c6f6125e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
index 6f13a7ad8bf..497e3296d8f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
index 997a2e2faf6..168abe52b1e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
index 1134056ddf1..c7910137c5d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferences.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
index f9e994c7fa3..6b0149124a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVMultipleSubscriptionListOfCovSubscriptionSpecificationEntryListOfCovReferencesEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
index 52924911b0f..4592cdac084 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCOVSubscription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
index 46395c8efe6..21441e5b96a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDate.go
index 3aef7abd9d3..79cd072ae14 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDateRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDateRange.go
index 9cd12862e81..f0b684ba010 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDateRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryDateRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
index 2047f617734..946b8d6e08a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetCalendarEntryEnclosedBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetCalendarEntryEnclosedBuilder
 	// WithCalendarEntry adds CalendarEntry (property field)
 	WithCalendarEntry(BACnetCalendarEntry) BACnetCalendarEntryEnclosedBuilder
-	// WithCalendarEntryBuilder adds CalendarEntry (property field) which is build by the builder
-	WithCalendarEntryBuilder(func(BACnetCalendarEntryBuilder) BACnetCalendarEntryBuilder) BACnetCalendarEntryEnclosedBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetCalendarEntryEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -143,19 +143,6 @@ func (m *_BACnetCalendarEntryEnclosedBuilder) WithCalendarEntry(calendarEntry BA
 	return m
 }
 
-func (m *_BACnetCalendarEntryEnclosedBuilder) WithCalendarEntryBuilder(builderSupplier func(BACnetCalendarEntryBuilder) BACnetCalendarEntryBuilder) BACnetCalendarEntryEnclosedBuilder {
-	builder := builderSupplier(m.CalendarEntry.CreateBACnetCalendarEntryBuilder())
-	var err error
-	m.CalendarEntry, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetCalendarEntryBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetCalendarEntryEnclosedBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetCalendarEntryEnclosedBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryWeekNDay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryWeekNDay.go
index 2eb2a4ac120..864edb9a030 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryWeekNDay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntryWeekNDay.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
index 9ef65f6ae21..e4e64177a24 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBitString.go
index f21dc0dac66..c00bfe04c77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBoolean.go
index 0fe4e06f54e..fe675d41b52 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueCharacterString.go
index 7ccf64891d2..eb2040481e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDate.go
index c7269d4de4d..1508b49d3c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDouble.go
index 0088cd2d9e5..a27d4bbe93b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueEnumerated.go
index 20f4222fd96..4abfe00e4b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueInteger.go
index 3b3e05a1ebe..456ef83fd05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueLightingCommand.go
index 2f348e71a7e..896e7c301fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueLightingCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueNull.go
index 95cbd5ba9e0..deadb57e7d8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueObjectidentifier.go
index 6becb0dad4c..fbe09ff6456 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueObjectidentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueOctetString.go
index eeb4e1a635d..355cd5c3eb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueReal.go
index da091ccc005..8541f8eb71a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueTime.go
index 256af5c64a0..18198247021 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueUnsigned.go
index 4a7b5f68079..6eb3df868b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
index 175b0a3266e..20f7145c44d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCharacterEncoding.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
index 7835fd04462..2c7fa56ced7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVNone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVNone.go
index 654d34de27d..1e7a5b991ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVNone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVNone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVObject.go
index fa1272dbf72..5b3bf447ff4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOVObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
index ace99ebe2b4..ede46ff5bf1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClosingTag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
index 4ea33e2825d..2e680d99ced 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 1434b28879c..8a732db90d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index 82234005e60..1ce9a516124 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index bff04aeffdb..a7373bc9197 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,8 +109,6 @@ type BACnetConfirmedServiceRequestAddListElementBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetConfirmedServiceRequestAddListElementBuilder
 	// WithListOfElements adds ListOfElements (property field)
 	WithOptionalListOfElements(BACnetConstructedData) BACnetConfirmedServiceRequestAddListElementBuilder
-	// WithOptionalListOfElementsBuilder adds ListOfElements (property field) which is build by the builder
-	WithOptionalListOfElementsBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestAddListElementBuilder
 	// Build builds the BACnetConfirmedServiceRequestAddListElement or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestAddListElement, error)
 	// MustBuild does the same as Build but panics on error
@@ -191,19 +191,6 @@ func (m *_BACnetConfirmedServiceRequestAddListElementBuilder) WithOptionalListOf
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestAddListElementBuilder) WithOptionalListOfElementsBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestAddListElementBuilder {
-	builder := builderSupplier(m.ListOfElements.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ListOfElements, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestAddListElementBuilder) Build() (BACnetConfirmedServiceRequestAddListElement, error) {
 	if m.ObjectIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index 5e2798805ff..d741ff0c54b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetConfirmedServiceRequestAtomicReadFileBuilder interface {
 	WithFileIdentifierBuilder(func(BACnetApplicationTagObjectIdentifierBuilder) BACnetApplicationTagObjectIdentifierBuilder) BACnetConfirmedServiceRequestAtomicReadFileBuilder
 	// WithAccessMethod adds AccessMethod (property field)
 	WithAccessMethod(BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord) BACnetConfirmedServiceRequestAtomicReadFileBuilder
-	// WithAccessMethodBuilder adds AccessMethod (property field) which is build by the builder
-	WithAccessMethodBuilder(func(BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder) BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder) BACnetConfirmedServiceRequestAtomicReadFileBuilder
 	// Build builds the BACnetConfirmedServiceRequestAtomicReadFile or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestAtomicReadFile, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_BACnetConfirmedServiceRequestAtomicReadFileBuilder) WithAccessMethod(a
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestAtomicReadFileBuilder) WithAccessMethodBuilder(builderSupplier func(BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder) BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder) BACnetConfirmedServiceRequestAtomicReadFileBuilder {
-	builder := builderSupplier(m.AccessMethod.CreateBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder())
-	var err error
-	m.AccessMethod, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestAtomicReadFileBuilder) Build() (BACnetConfirmedServiceRequestAtomicReadFile, error) {
 	if m.FileIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
index e61685abd33..ca9d54af031 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
index 2a081f8160d..b13eddd047e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
index 9e9726fed92..566d68a1d7b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 82643bf8887..f7c98381d17 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
index d94b246301a..ed86ab50745 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index bd775c6a583..4945d060b96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index a8e3dd067cf..51770edc575 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 1c52fe5a207..dd03831c277 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -200,8 +202,6 @@ type BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder interface {
 	WithToStateBuilder(func(BACnetEventStateTaggedBuilder) BACnetEventStateTaggedBuilder) BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder
 	// WithEventValues adds EventValues (property field)
 	WithOptionalEventValues(BACnetNotificationParameters) BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder
-	// WithOptionalEventValuesBuilder adds EventValues (property field) which is build by the builder
-	WithOptionalEventValuesBuilder(func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder
 	// Build builds the BACnetConfirmedServiceRequestConfirmedEventNotification or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestConfirmedEventNotification, error)
 	// MustBuild does the same as Build but panics on error
@@ -446,19 +446,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder) WithOp
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder) WithOptionalEventValuesBuilder(builderSupplier func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder {
-	builder := builderSupplier(m.EventValues.CreateBACnetNotificationParametersBuilder())
-	var err error
-	m.EventValues, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetNotificationParametersBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestConfirmedEventNotificationBuilder) Build() (BACnetConfirmedServiceRequestConfirmedEventNotification, error) {
 	if m.ProcessIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index 59d6b23f6d2..db16efb558d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -99,8 +101,6 @@ type BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder interface {
 	WithServiceNumberBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder
 	// WithServiceParameters adds ServiceParameters (property field)
 	WithOptionalServiceParameters(BACnetConstructedData) BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder
-	// WithOptionalServiceParametersBuilder adds ServiceParameters (property field) which is build by the builder
-	WithOptionalServiceParametersBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder
 	// Build builds the BACnetConfirmedServiceRequestConfirmedPrivateTransfer or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestConfirmedPrivateTransfer, error)
 	// MustBuild does the same as Build but panics on error
@@ -165,19 +165,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder) WithOpti
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder) WithOptionalServiceParametersBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder {
-	builder := builderSupplier(m.ServiceParameters.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ServiceParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestConfirmedPrivateTransferBuilder) Build() (BACnetConfirmedServiceRequestConfirmedPrivateTransfer, error) {
 	if m.VendorId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index ba48d30628e..1a68408b5eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,8 +104,6 @@ type BACnetConfirmedServiceRequestConfirmedTextMessageBuilder interface {
 	WithTextMessageSourceDeviceBuilder(func(BACnetContextTagObjectIdentifierBuilder) BACnetContextTagObjectIdentifierBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder
 	// WithMessageClass adds MessageClass (property field)
 	WithOptionalMessageClass(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder
-	// WithOptionalMessageClassBuilder adds MessageClass (property field) which is build by the builder
-	WithOptionalMessageClassBuilder(func(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder
 	// WithMessagePriority adds MessagePriority (property field)
 	WithMessagePriority(BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder
 	// WithMessagePriorityBuilder adds MessagePriority (property field) which is build by the builder
@@ -158,19 +158,6 @@ func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageBuilder) WithOptional
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageBuilder) WithOptionalMessageClassBuilder(builderSupplier func(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder {
-	builder := builderSupplier(m.MessageClass.CreateBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder())
-	var err error
-	m.MessageClass, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestConfirmedTextMessageBuilder) WithMessagePriority(messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) BACnetConfirmedServiceRequestConfirmedTextMessageBuilder {
 	m.MessagePriority = messagePriority
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
index 20b10e2d7ff..c9b2694aacd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
index 416763a599c..23c3d519755 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassCharacter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
index 65e38a50ab4..7485eda5e4b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassNumeric.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
index 33ff20bc98a..3d9b723b8df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriority.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
index 72fdb5adaf0..570a11a4f12 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index c820c6ce60c..1e5f69e4f7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
index 172ebda11e9..7571f7e73bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObjectObjectSpecifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
index 4ea0eecbc44..f4a6f400d22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index 40b6f9eb7b2..76a0ee4c915 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
index 51117b2ca5e..644304ac64b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
index 0f7c16aa35b..2ca0a1b843e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControlEnableDisableTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index d35b3b3c0d9..037e2f9a33a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
index 480b8dd9b5a..a23e336c6b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilter.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
index d3ebcfe70c1..e30a058fc22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryAcknowledgementFilterTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
index c3f28e0be7c..0866e00da3e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilter.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
index 8124c7d04be..634e7e8ca0e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryEventStateFilterTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
index 90996150596..4c01ea436ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummaryPriorityFilter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index 16925579283..f1481f37ce5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index ea293da7dbf..6882fd3e4f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index afa0a69e70a..1c68f56382d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
index 59566f0b30d..26038524454 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index e6a5d4d9c21..5c63fbad81c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index 85dbd97ae24..f9477585a1d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,8 +109,6 @@ type BACnetConfirmedServiceRequestReadRangeBuilder interface {
 	WithOptionalPropertyArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetConfirmedServiceRequestReadRangeBuilder
 	// WithReadRange adds ReadRange (property field)
 	WithOptionalReadRange(BACnetConfirmedServiceRequestReadRangeRange) BACnetConfirmedServiceRequestReadRangeBuilder
-	// WithOptionalReadRangeBuilder adds ReadRange (property field) which is build by the builder
-	WithOptionalReadRangeBuilder(func(BACnetConfirmedServiceRequestReadRangeRangeBuilder) BACnetConfirmedServiceRequestReadRangeRangeBuilder) BACnetConfirmedServiceRequestReadRangeBuilder
 	// Build builds the BACnetConfirmedServiceRequestReadRange or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestReadRange, error)
 	// MustBuild does the same as Build but panics on error
@@ -191,19 +191,6 @@ func (m *_BACnetConfirmedServiceRequestReadRangeBuilder) WithOptionalReadRange(r
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestReadRangeBuilder) WithOptionalReadRangeBuilder(builderSupplier func(BACnetConfirmedServiceRequestReadRangeRangeBuilder) BACnetConfirmedServiceRequestReadRangeRangeBuilder) BACnetConfirmedServiceRequestReadRangeBuilder {
-	builder := builderSupplier(m.ReadRange.CreateBACnetConfirmedServiceRequestReadRangeRangeBuilder())
-	var err error
-	m.ReadRange, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConfirmedServiceRequestReadRangeRangeBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestReadRangeBuilder) Build() (BACnetConfirmedServiceRequestReadRange, error) {
 	if m.ObjectIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
index f7589421739..88dad254c63 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByPosition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByPosition.go
index a4f832df8ea..25d75a45f2a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByPosition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByPosition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.go
index bc949e10de4..e948fda581d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeBySequenceNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByTime.go
index 0a6ea874080..7d90f96323d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRangeByTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index 418db9892a4..283ba0a26f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
index 23b7eb304d2..48214bb8c5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDevice.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
index 7730b5b0891..ad7ef92bb2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceReinitializedStateOfDeviceTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index 0a5e80f79b8..12a1ba7b498 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,8 +109,6 @@ type BACnetConfirmedServiceRequestRemoveListElementBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetConfirmedServiceRequestRemoveListElementBuilder
 	// WithListOfElements adds ListOfElements (property field)
 	WithOptionalListOfElements(BACnetConstructedData) BACnetConfirmedServiceRequestRemoveListElementBuilder
-	// WithOptionalListOfElementsBuilder adds ListOfElements (property field) which is build by the builder
-	WithOptionalListOfElementsBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestRemoveListElementBuilder
 	// Build builds the BACnetConfirmedServiceRequestRemoveListElement or returns an error if something is wrong
 	Build() (BACnetConfirmedServiceRequestRemoveListElement, error)
 	// MustBuild does the same as Build but panics on error
@@ -191,19 +191,6 @@ func (m *_BACnetConfirmedServiceRequestRemoveListElementBuilder) WithOptionalLis
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestRemoveListElementBuilder) WithOptionalListOfElementsBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestRemoveListElementBuilder {
-	builder := builderSupplier(m.ListOfElements.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ListOfElements, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestRemoveListElementBuilder) Build() (BACnetConfirmedServiceRequestRemoveListElement, error) {
 	if m.ObjectIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
index 0f0ee0ac82c..b919047a497 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index f5ac39ba7ac..c4f3135cfec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index f717997f829..7caddd917a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index c2c4d57ebb0..157db485405 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
index 8629386c8d5..bcea4e30d36 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecifications.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
index a939f436329..1b93ad96b0f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
index e0cddcc231b..bd8f93f2726 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleListOfCovSubscriptionSpecificationsReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
index 60e4e8f2e48..a0463f494c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestUnknown.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index 3dadbc33353..9c1fd0fe09f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
index a59685ebe88..5ee49fdd1fa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
index c1cb04dba1e..371f4830694 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index c097cce2213..c3f25fcb093 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -114,8 +116,6 @@ type BACnetConfirmedServiceRequestWritePropertyBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetConfirmedServiceRequestWritePropertyBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithPropertyValue(BACnetConstructedData) BACnetConfirmedServiceRequestWritePropertyBuilder
-	// WithPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestWritePropertyBuilder
 	// WithPriority adds Priority (property field)
 	WithOptionalPriority(BACnetContextTagUnsignedInteger) BACnetConfirmedServiceRequestWritePropertyBuilder
 	// WithOptionalPriorityBuilder adds Priority (property field) which is build by the builder
@@ -202,19 +202,6 @@ func (m *_BACnetConfirmedServiceRequestWritePropertyBuilder) WithPropertyValue(p
 	return m
 }
 
-func (m *_BACnetConfirmedServiceRequestWritePropertyBuilder) WithPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConfirmedServiceRequestWritePropertyBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConfirmedServiceRequestWritePropertyBuilder) WithOptionalPriority(priority BACnetContextTagUnsignedInteger) BACnetConfirmedServiceRequestWritePropertyBuilder {
 	m.Priority = priority
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index 0a4a6937eec..25ec458ff01 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
index 0ae4f0c90f0..a805ab0ba7c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
index 3d481759628..375ef8c5334 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDULength.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
index d0154b248c7..4aa9cc5703e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUSegmentTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
index 0caa467d443..287e89bd0ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAPDUTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
index 4f4d9a057df..f327cbcc27f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAbsenteeLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
index 28810db5054..68f4fca8ffe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAcceptedModes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
index bf764159ea0..d2a2b3f9be5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessAlarmEvents.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
index f003acce950..0fed005f521 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessCredentialAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
index d24fd37f9b1..fc3fa6887f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
index e95f03e840d..6e9d5fec375 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
index 3934a641d33..9f1bb956e48 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
index bebdcf80a70..fd296c3c6d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
index b760afbdf99..74bf35bdc78 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoorRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
index e48b8d65f00..eafa9fb1729 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessDoors.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
index 925a2f8fe5b..10439fb8346 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
index 892568d468c..5895b67b481 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventAuthenticationFactor.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
index 6ec7c9afd38..2599fbbc3bb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventCredential.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
index bf4af25717d..1f183e34182 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
index d519b165bf8..159a5d53cbb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessEventTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataAccessEventTimeBuilder interface {
 	WithMandatoryFields(accessEventTime BACnetTimeStamp) BACnetConstructedDataAccessEventTimeBuilder
 	// WithAccessEventTime adds AccessEventTime (property field)
 	WithAccessEventTime(BACnetTimeStamp) BACnetConstructedDataAccessEventTimeBuilder
-	// WithAccessEventTimeBuilder adds AccessEventTime (property field) which is build by the builder
-	WithAccessEventTimeBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataAccessEventTimeBuilder
 	// Build builds the BACnetConstructedDataAccessEventTime or returns an error if something is wrong
 	Build() (BACnetConstructedDataAccessEventTime, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataAccessEventTimeBuilder) WithAccessEventTime(acces
 	return m
 }
 
-func (m *_BACnetConstructedDataAccessEventTimeBuilder) WithAccessEventTimeBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataAccessEventTimeBuilder {
-	builder := builderSupplier(m.AccessEventTime.CreateBACnetTimeStampBuilder())
-	var err error
-	m.AccessEventTime, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataAccessEventTimeBuilder) Build() (BACnetConstructedDataAccessEventTime, error) {
 	if m.AccessEventTime == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
index 1b850702b2d..560238e7e51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessPointAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
index df6c038e41d..303ada040ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessRightsAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
index 8eaef20ebd8..5a872759f7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessTransactionEvents.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
index 37c07405e6d..4a06bfbe1b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessUserAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
index fdbd436e789..04de91db280 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAdjustValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
index 5d06979aad0..4d06be7e15a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
index edb8f65e1f0..5ca27d2f04d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccessZoneAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
index dab694c46e8..4c4e70656bb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompaniment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
index d4758665dc9..07047dfd6d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccompanimentTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
index f62d5013be9..87f5985334e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
index dde298c5f51..153dcf6b07b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
index bb748aecb59..677b29ab948 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
index 7d43284804d..c285d2664b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
index 30a1922e39c..875829f1d49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
index 7900909bf7d..d749e1fa0f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
index af78699a906..8dda55fe948 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAccumulatorMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
index 6cbd3b5f0fb..3b7ae8fc183 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckRequired.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
index 1565f992d6f..c64da8addb4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAckedTransitions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
index 2ada4404688..62d24a57932 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAction.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
index 40ac91aff32..d368406bda7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActionText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
index 77668caa370..7b9633610cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActivationTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
index 2ec115d4c29..565ac95207f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveAuthenticationPolicy.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
index 27b02d7f71b..afed27e6e8d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVMultipleSubscriptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
index a8c59c571a8..8b3063e09dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveCOVSubscriptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
index 8bd5ca28f6e..ed8359fb0cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
index 625b6784245..f4e50ac0859 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActiveVTSessions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
index c14db0bae6c..b5a1069c18e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataActualShedLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataActualShedLevelBuilder interface {
 	WithMandatoryFields(actualShedLevel BACnetShedLevel) BACnetConstructedDataActualShedLevelBuilder
 	// WithActualShedLevel adds ActualShedLevel (property field)
 	WithActualShedLevel(BACnetShedLevel) BACnetConstructedDataActualShedLevelBuilder
-	// WithActualShedLevelBuilder adds ActualShedLevel (property field) which is build by the builder
-	WithActualShedLevelBuilder(func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataActualShedLevelBuilder
 	// Build builds the BACnetConstructedDataActualShedLevel or returns an error if something is wrong
 	Build() (BACnetConstructedDataActualShedLevel, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataActualShedLevelBuilder) WithActualShedLevel(actua
 	return m
 }
 
-func (m *_BACnetConstructedDataActualShedLevelBuilder) WithActualShedLevelBuilder(builderSupplier func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataActualShedLevelBuilder {
-	builder := builderSupplier(m.ActualShedLevel.CreateBACnetShedLevelBuilder())
-	var err error
-	m.ActualShedLevel, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetShedLevelBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataActualShedLevelBuilder) Build() (BACnetConstructedDataActualShedLevel, error) {
 	if m.ActualShedLevel == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
index a17be2ee80a..805afdce42b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAdjustValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
index 9cd97276032..9042f314d4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
index 46b12329901..3c01f8ddce6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
index 2589237eeda..23a208a8a2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
index 80123cc63d2..e9eed629bc4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlertEnrollmentPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
index c86dfc3de56..09e92697cf9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAlignIntervals.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
index 9a23477e725..b942a0c8272 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllWritesSuccessful.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
index 1c562142926..ca06570dc93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAllowGroupDelayInhibit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
index ca46dd93cd7..5d9fe217aea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
index 9955930ce19..c38c70eb450 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
index e22f0fc479d..0f6dbf22fb8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
index adbc9e45742..8dbb7209ef7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataAnalogInputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalREAL) BACnetConstructedDataAnalogInputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalREAL) BACnetConstructedDataAnalogInputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataAnalogInputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataAnalogInputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataAnalogInputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataAnalogInputInterfaceValueBuilder) WithInterfaceVa
 	return m
 }
 
-func (m *_BACnetConstructedDataAnalogInputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataAnalogInputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalREALBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalREALBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataAnalogInputInterfaceValueBuilder) Build() (BACnetConstructedDataAnalogInputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
index 30604bbf84f..4a58cd32c41 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
index b4cf1f6afc8..d244bd43131 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogInputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
index 72ec4af5972..110dedcd359 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
index 0a62173bf9b..d203043e22b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataAnalogOutputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalREAL) BACnetConstructedDataAnalogOutputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalREAL) BACnetConstructedDataAnalogOutputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataAnalogOutputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataAnalogOutputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataAnalogOutputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataAnalogOutputInterfaceValueBuilder) WithInterfaceV
 	return m
 }
 
-func (m *_BACnetConstructedDataAnalogOutputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataAnalogOutputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalREALBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalREALBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataAnalogOutputInterfaceValueBuilder) Build() (BACnetConstructedDataAnalogOutputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
index 75cc381b9a0..ea4f676decd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
index 0f15cde61ed..edd467654ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
index 054cf494ec4..e1ed8b2b402 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogOutputRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
index 339cc929eb2..203c608ef4e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
index 4bc4484a417..74ba4800fa0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
index eee5aae3ef8..caa0a27f4d8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
index 2e20e6c1184..0104f971572 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
index 01d11e39c25..1ac0506391f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
index fc926ecbcd6..384ef423443 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAnalogValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
index bb4c1d40266..ded96f74113 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataApplicationSoftwareVersion.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
index cd4c1163211..5eca99f9d94 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataArchive.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
index 39a73c40f20..47b6311b18f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedAccessRights.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
index 514bf37669e..6ae872f4c17 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAssignedLandingCalls.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
index 37339f5ce19..1c59120f3a0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAttemptedSamples.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
index 0e3db38d199..e262b088379 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationFactors.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
index cd38ae5fab5..731bae1091c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
index 9722c5e88a0..f08ac0ecebc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationPolicyNames.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
index 83b7a854bac..26f32e16d37 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthenticationStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
index 0dacbb48823..44785545a82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationExemptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
index 83ee46f389d..0698b208f51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAuthorizationMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
index 03b545a4bc1..a655f8add00 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAutoSlaveDiscovery.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
index be048268261..697122ada74 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAverageValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
index c5ea986b827..65e511f1147 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataAveragingAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
index b4808883fea..061aac82839 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPGlobalAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
index 50934a616f5..23cf1acb436 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
index 406a44e72fb..1134f0e6fee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPMulticastAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
index 93116fb8304..3fcdb6e1289 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPNATTraversal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
index 4f51fc90504..50cbc178908 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPUDPPort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
index 37588a189fe..602c5f1a4cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6Mode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
index f19eb43b81f..51348f28d5d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6MulticastAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
index d21b3d20cdb..313b005353a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBACnetIPv6UDPPort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
index 9aa20126d9c..1e432332b2e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDAcceptFDRegistrations.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
index 6e65b450b3f..0fba79edb74 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDBroadcastDistributionTable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
index 957070adf6e..ef46d8c4f57 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBBMDForeignDeviceTable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
index 7e1be235912..311be16461e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupAndRestoreState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
index 29b3e9fa638..bec7714c4e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupFailureTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
index 0b6aaefb5d6..6cce6557018 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBackupPreparationTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
index ae0cdd906fc..6cebf089734 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBaseDeviceSecurityPolicy.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
index fac8adc527f..12201d15bd8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBelongsTo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
index 9711002ad0e..4022cabed02 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBias.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
index b1e0794590c..697f494d2b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
index a98136f985a..d1ae215b864 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataBinaryInputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalBinaryPV) BACnetConstructedDataBinaryInputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalBinaryPV) BACnetConstructedDataBinaryInputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataBinaryInputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataBinaryInputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataBinaryInputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataBinaryInputInterfaceValueBuilder) WithInterfaceVa
 	return m
 }
 
-func (m *_BACnetConstructedDataBinaryInputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataBinaryInputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalBinaryPVBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalBinaryPVBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataBinaryInputInterfaceValueBuilder) Build() (BACnetConstructedDataBinaryInputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
index f2dc027f9f2..7313ffabcdc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryInputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
index 4903516bfd6..601ae42a13d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
index d6143ba4f3b..47eb16c98a6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputFeedbackValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
index 293ff4b7316..25bbd246f87 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
index f281e07c7ba..e7828ed4886 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryLightingOutputRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
index 228ff6cc693..03a86308d09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
index fb66f8f3b2e..1fdc06f62e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputFeedbackValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
index 67eaba822a1..c82cb62ba90 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataBinaryOutputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalBinaryPV) BACnetConstructedDataBinaryOutputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalBinaryPV) BACnetConstructedDataBinaryOutputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataBinaryOutputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataBinaryOutputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataBinaryOutputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataBinaryOutputInterfaceValueBuilder) WithInterfaceV
 	return m
 }
 
-func (m *_BACnetConstructedDataBinaryOutputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataBinaryOutputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalBinaryPVBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalBinaryPVBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataBinaryOutputInterfaceValueBuilder) Build() (BACnetConstructedDataBinaryOutputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
index b7aaed7a645..a56633935eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
index 8d5efb7ab31..845b51b85f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryOutputRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
index 036cbb3b31e..82c76079cb5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
index 16d6707f6fd..e3912d084cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
index b06078c0e9f..3f8009eba83 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBinaryValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
index 4083d2938e3..ee05b89faec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitMask.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
index d612ba2a8b9..4c5ed174158 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
index 5ab84612fdc..f94dc11b69d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
index 4879bc7a312..3e7ab648a82 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitStringValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
index 8c241bd24c2..658586311d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
index 93473e9d05c..7b697dcf09c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBitstringValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
index bbcf62bef34..a604de41b0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBlinkWarnEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
index 0fc263a198a..79502213b38 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataBufferSize.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
index eec4ecf8dd3..08dad411b6a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
index 54aec062822..3fecf0281ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVPeriod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
index 1c09f628cf0..94a2490bfc5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVResubscriptionInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
index b5759097755..f91a1dff9d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVUPeriod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
index 5242c6b6e00..21f2e6a03d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCOVURecipients.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
index 05a663d9de1..d16208bcf7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
index 96dd925bf57..cbaf477c902 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCalendarPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
index c5ddb7fd62f..d13792387ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarAssignedDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
index b7aaecb7249..8c4347b264c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
index b9514bd3a93..877f6b630e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
index 249009769a4..8c59b2184d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
index fade5022a72..edc8f844d28 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDoorZone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
index b4250200aaf..f9ddeeb63b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarDriveStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
index 556fda0e9aa..a849372b997 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoad.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
index a8bd0293d68..6d22d7390d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarLoadUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
index 5d6184a8b06..4796965c2f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
index 6f370feb17c..55186553a80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarMovingDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
index e260a6f2881..ba4db920488 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCarPosition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
index d0b715b6b49..789f9df4d16 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
index 839bb218af5..02f5351f097 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangeOfStateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
index 52f1d81b59d..c4125d701d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChangesPending.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
index fbdfda5b39a..9bc35b5f8d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
index b3178e0c9e9..1e9e2773110 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelListOfObjectPropertyReferences.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
index 5317cdfab82..936b723caef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
index 6fba3ffcc7d..ff54b28ac57 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataChannelPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataChannelPresentValueBuilder interface {
 	WithMandatoryFields(presentValue BACnetChannelValue) BACnetConstructedDataChannelPresentValueBuilder
 	// WithPresentValue adds PresentValue (property field)
 	WithPresentValue(BACnetChannelValue) BACnetConstructedDataChannelPresentValueBuilder
-	// WithPresentValueBuilder adds PresentValue (property field) which is build by the builder
-	WithPresentValueBuilder(func(BACnetChannelValueBuilder) BACnetChannelValueBuilder) BACnetConstructedDataChannelPresentValueBuilder
 	// Build builds the BACnetConstructedDataChannelPresentValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataChannelPresentValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataChannelPresentValueBuilder) WithPresentValue(pres
 	return m
 }
 
-func (m *_BACnetConstructedDataChannelPresentValueBuilder) WithPresentValueBuilder(builderSupplier func(BACnetChannelValueBuilder) BACnetChannelValueBuilder) BACnetConstructedDataChannelPresentValueBuilder {
-	builder := builderSupplier(m.PresentValue.CreateBACnetChannelValueBuilder())
-	var err error
-	m.PresentValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetChannelValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataChannelPresentValueBuilder) Build() (BACnetConstructedDataChannelPresentValue, error) {
 	if m.PresentValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
index 13854f6d531..f218f695b30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
index ca550e0edf7..d0734b445e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
index 4de51ae9a9f..570b258b154 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
index 7068750a993..dc6f0f70e31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterStringValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
index 3951ba9e431..287742cbfca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCharacterstringValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
index 952647be31c..717e8930892 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataClientCOVIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataClientCOVIncrementBuilder interface {
 	WithMandatoryFields(covIncrement BACnetClientCOV) BACnetConstructedDataClientCOVIncrementBuilder
 	// WithCovIncrement adds CovIncrement (property field)
 	WithCovIncrement(BACnetClientCOV) BACnetConstructedDataClientCOVIncrementBuilder
-	// WithCovIncrementBuilder adds CovIncrement (property field) which is build by the builder
-	WithCovIncrementBuilder(func(BACnetClientCOVBuilder) BACnetClientCOVBuilder) BACnetConstructedDataClientCOVIncrementBuilder
 	// Build builds the BACnetConstructedDataClientCOVIncrement or returns an error if something is wrong
 	Build() (BACnetConstructedDataClientCOVIncrement, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataClientCOVIncrementBuilder) WithCovIncrement(covIn
 	return m
 }
 
-func (m *_BACnetConstructedDataClientCOVIncrementBuilder) WithCovIncrementBuilder(builderSupplier func(BACnetClientCOVBuilder) BACnetClientCOVBuilder) BACnetConstructedDataClientCOVIncrementBuilder {
-	builder := builderSupplier(m.CovIncrement.CreateBACnetClientCOVBuilder())
-	var err error
-	m.CovIncrement, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetClientCOVBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataClientCOVIncrementBuilder) Build() (BACnetConstructedDataClientCOVIncrement, error) {
 	if m.CovIncrement == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
index 7700eea91db..d5b1e32d0fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
index 517128e089f..d3156ffc177 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAction.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
index 5e24347b5a5..9984dfc5a4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
index adf987eda97..80cb1a6459f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCommandTimeArray.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
index 52288438af7..209e054d4be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataConfigurationFiles.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
index 12fee2918ff..6af8a30a3bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlGroups.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
index ec45ca6be76..b38da83d3c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
index 1873d4b0459..bcfcd162cfe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
index c992d8494ba..86148460c04 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataControlledVariableValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
index 345c99524c9..955aa9d7efb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
index aec6a55130b..33b21929693 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountBeforeChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
index c74450e5fe7..358f16a4a95 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCountChangeTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
index 1df0687f0a5..f94d05cc131 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
index 58341719c9a..006436ae968 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
index e6b4bd4278d..a6bbadfc8e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDataInputUpdateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataCredentialDataInputUpdateTimeBuilder interface {
 	WithMandatoryFields(updateTime BACnetTimeStamp) BACnetConstructedDataCredentialDataInputUpdateTimeBuilder
 	// WithUpdateTime adds UpdateTime (property field)
 	WithUpdateTime(BACnetTimeStamp) BACnetConstructedDataCredentialDataInputUpdateTimeBuilder
-	// WithUpdateTimeBuilder adds UpdateTime (property field) which is build by the builder
-	WithUpdateTimeBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataCredentialDataInputUpdateTimeBuilder
 	// Build builds the BACnetConstructedDataCredentialDataInputUpdateTime or returns an error if something is wrong
 	Build() (BACnetConstructedDataCredentialDataInputUpdateTime, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataCredentialDataInputUpdateTimeBuilder) WithUpdateT
 	return m
 }
 
-func (m *_BACnetConstructedDataCredentialDataInputUpdateTimeBuilder) WithUpdateTimeBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataCredentialDataInputUpdateTimeBuilder {
-	builder := builderSupplier(m.UpdateTime.CreateBACnetTimeStampBuilder())
-	var err error
-	m.UpdateTime, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataCredentialDataInputUpdateTimeBuilder) Build() (BACnetConstructedDataCredentialDataInputUpdateTime, error) {
 	if m.UpdateTime == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
index 3eca1043911..76af2a96373 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialDisable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
index c69218b99fa..fc6c56dc9a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
index 2b4ee75e308..c068285ee93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentials.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
index a54f10a31fb..2cb29395606 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCredentialsInZone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
index c0eefd1a4f5..98657feff12 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataCurrentCommandPriority.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataCurrentCommandPriorityBuilder interface {
 	WithMandatoryFields(currentCommandPriority BACnetOptionalUnsigned) BACnetConstructedDataCurrentCommandPriorityBuilder
 	// WithCurrentCommandPriority adds CurrentCommandPriority (property field)
 	WithCurrentCommandPriority(BACnetOptionalUnsigned) BACnetConstructedDataCurrentCommandPriorityBuilder
-	// WithCurrentCommandPriorityBuilder adds CurrentCommandPriority (property field) which is build by the builder
-	WithCurrentCommandPriorityBuilder(func(BACnetOptionalUnsignedBuilder) BACnetOptionalUnsignedBuilder) BACnetConstructedDataCurrentCommandPriorityBuilder
 	// Build builds the BACnetConstructedDataCurrentCommandPriority or returns an error if something is wrong
 	Build() (BACnetConstructedDataCurrentCommandPriority, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataCurrentCommandPriorityBuilder) WithCurrentCommand
 	return m
 }
 
-func (m *_BACnetConstructedDataCurrentCommandPriorityBuilder) WithCurrentCommandPriorityBuilder(builderSupplier func(BACnetOptionalUnsignedBuilder) BACnetOptionalUnsignedBuilder) BACnetConstructedDataCurrentCommandPriorityBuilder {
-	builder := builderSupplier(m.CurrentCommandPriority.CreateBACnetOptionalUnsignedBuilder())
-	var err error
-	m.CurrentCommandPriority, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalUnsignedBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataCurrentCommandPriorityBuilder) Build() (BACnetConstructedDataCurrentCommandPriority, error) {
 	if m.CurrentCommandPriority == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
index ba0761fe865..598a06a5c6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatabaseRevision.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
index 3d8c458a252..a58859c24dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
index 243f447a631..2a175f2090d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
index fbbd1d42c85..e60b1e7cc28 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatePatternValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
index 2f06f598c38..7f64f4a7fd5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
index f4ce412cbbb..fd074514f93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimePatternValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
index 57b14ab5292..8aacca586be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
index 9811bfe8500..372f2f5d3ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateTimeValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
index 61adf2c9496..55d9ebf9db4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
index 8189bac07a9..102d7fd0d25 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
index da4ca31598e..1aae56439b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDateValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
index 85df20fbeac..027592cd4fd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatepatternValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
index b7fe24fd278..c92375efe71 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimeValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
index 2a12fa2c267..feb3ff51406 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDatetimepatternValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
index 08abaa6a7f1..95f07e4625c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaylightSavingsStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
index a1038dd3141..f7d06c3c3ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDaysRemaining.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
index ab7ed9191a8..222b8d745e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeadband.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
index 14cf4603598..f23c78a7054 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultFadeTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
index 381b26aee00..432d792dd5b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultRampRate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
index 2791f699d4e..3ce6bfc159a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultStepIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
index 5e4c271deb6..1da5ba57207 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultSubordinateRelationship.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
index b212a99c3be..c1277fc4647 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDefaultTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
index 70cf483167d..94113f0396a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeployedProfileLocation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
index 07b350b8c17..2de5f0f97c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstant.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
index 06f9847846b..03e9dc01430 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDerivativeConstantUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
index 4a355acbe43..ecb0fac7f78 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
index d853dbbf969..4fac4546422 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDescriptionOfHalt.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
index d921757e3da..a981f16f86f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAddressBinding.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
index 2b5877637fe..5c815172d65 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
index 7d1d0b7de61..844193b9da6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxInfoFrames.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
index 4f01cd82818..92dd3db1fde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceMaxMaster.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
index a189efa7fef..cb8dde20e18 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDeviceType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
index 96ff95c61f2..d27fd3dd589 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDirectReading.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
index d61abc46247..5a1c88b22da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDistributionKeyRevision.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
index 9a7fa3ab00f..ee1135324d8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoNotHide.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
index 8a3dfad01c4..cd86aa431a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorAlarmState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
index ad4a7be4f67..c7b163f89e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorExtendedPulseTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
index 23a0b5b122b..dbe950a426b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
index 251d5d5a43f..e62d64a4e1e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorOpenTooLongTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
index ef8c3477571..af7104cac97 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorPulseTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
index c2429e29a09..739f324e63f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
index 214f198af7c..90935e89b54 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDoorUnlockDelayTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
index 54311db9e49..4c465ad2e3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataDutyWindow.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
index 43953d2ce74..c31daeea14e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEffectivePeriod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
index 0e9490e9cbf..52a14d74922 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressActive.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
index c8674a415cc..5f47704610f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEgressTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
index 6090a3cbc5d..a174e556d7b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElapsedActiveTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
index a1f86dc9196..d302189dd4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -98,16 +100,10 @@ type BACnetConstructedDataElementBuilder interface {
 	WithPeekedTagHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetConstructedDataElementBuilder
 	// WithApplicationTag adds ApplicationTag (property field)
 	WithOptionalApplicationTag(BACnetApplicationTag) BACnetConstructedDataElementBuilder
-	// WithOptionalApplicationTagBuilder adds ApplicationTag (property field) which is build by the builder
-	WithOptionalApplicationTagBuilder(func(BACnetApplicationTagBuilder) BACnetApplicationTagBuilder) BACnetConstructedDataElementBuilder
 	// WithContextTag adds ContextTag (property field)
 	WithOptionalContextTag(BACnetContextTag) BACnetConstructedDataElementBuilder
-	// WithOptionalContextTagBuilder adds ContextTag (property field) which is build by the builder
-	WithOptionalContextTagBuilder(func(BACnetContextTagBuilder) BACnetContextTagBuilder) BACnetConstructedDataElementBuilder
 	// WithConstructedData adds ConstructedData (property field)
 	WithOptionalConstructedData(BACnetConstructedData) BACnetConstructedDataElementBuilder
-	// WithOptionalConstructedDataBuilder adds ConstructedData (property field) which is build by the builder
-	WithOptionalConstructedDataBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConstructedDataElementBuilder
 	// Build builds the BACnetConstructedDataElement or returns an error if something is wrong
 	Build() (BACnetConstructedDataElement, error)
 	// MustBuild does the same as Build but panics on error
@@ -154,55 +150,16 @@ func (m *_BACnetConstructedDataElementBuilder) WithOptionalApplicationTag(applic
 	return m
 }
 
-func (m *_BACnetConstructedDataElementBuilder) WithOptionalApplicationTagBuilder(builderSupplier func(BACnetApplicationTagBuilder) BACnetApplicationTagBuilder) BACnetConstructedDataElementBuilder {
-	builder := builderSupplier(m.ApplicationTag.CreateBACnetApplicationTagBuilder())
-	var err error
-	m.ApplicationTag, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetApplicationTagBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataElementBuilder) WithOptionalContextTag(contextTag BACnetContextTag) BACnetConstructedDataElementBuilder {
 	m.ContextTag = contextTag
 	return m
 }
 
-func (m *_BACnetConstructedDataElementBuilder) WithOptionalContextTagBuilder(builderSupplier func(BACnetContextTagBuilder) BACnetContextTagBuilder) BACnetConstructedDataElementBuilder {
-	builder := builderSupplier(m.ContextTag.CreateBACnetContextTagBuilder())
-	var err error
-	m.ContextTag, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetContextTagBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataElementBuilder) WithOptionalConstructedData(constructedData BACnetConstructedData) BACnetConstructedDataElementBuilder {
 	m.ConstructedData = constructedData
 	return m
 }
 
-func (m *_BACnetConstructedDataElementBuilder) WithOptionalConstructedDataBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetConstructedDataElementBuilder {
-	builder := builderSupplier(m.ConstructedData.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ConstructedData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataElementBuilder) Build() (BACnetConstructedDataElement, error) {
 	if m.PeekedTagHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
index 77e3bb02c29..e4addf0f5dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroup.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
index bdf3d1140aa..580a8cce5e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
index c4d1d1fc32d..d5a55409e2d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElevatorGroupGroupMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
index 016a0956d3d..c1e293d51db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
index a07cc889134..db80973c096 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
index eba3a068f70..eae4d432d2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEnergyMeterRef.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
index 8af6f936343..7d8cb31a1b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEntryPoints.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
index 745d5aac946..8e479ecff2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataErrorLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
index 565ce2567d1..a29b94ca7b5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
index 60b8ac6733b..3649a695078 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorFaultSignals.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
index 05551861d31..e8c1872eb79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEscalatorMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
index ab422a779d4..99675d54724 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
index 71053696659..7fbae3debf0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventAlgorithmInhibitRef.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
index aea1b9f2940..dd9638abaf5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventDetectionEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
index b3fd16cf936..6c34fdeb6c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
index 4bc4bdf2967..ce390078a77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventEnrollmentAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
index b7eac7415c7..26cdfb4f198 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
index c1ff3a73477..4e2f16aa93c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventLogLogBuffer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
index a0fdf4f50bc..26cdaf46f4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTexts.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
index d51e4001cd6..888c9990173 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventMessageTextsConfig.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
index ce23d1a134d..136b4ca97fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataEventParametersBuilder interface {
 	WithMandatoryFields(eventParameter BACnetEventParameter) BACnetConstructedDataEventParametersBuilder
 	// WithEventParameter adds EventParameter (property field)
 	WithEventParameter(BACnetEventParameter) BACnetConstructedDataEventParametersBuilder
-	// WithEventParameterBuilder adds EventParameter (property field) which is build by the builder
-	WithEventParameterBuilder(func(BACnetEventParameterBuilder) BACnetEventParameterBuilder) BACnetConstructedDataEventParametersBuilder
 	// Build builds the BACnetConstructedDataEventParameters or returns an error if something is wrong
 	Build() (BACnetConstructedDataEventParameters, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataEventParametersBuilder) WithEventParameter(eventP
 	return m
 }
 
-func (m *_BACnetConstructedDataEventParametersBuilder) WithEventParameterBuilder(builderSupplier func(BACnetEventParameterBuilder) BACnetEventParameterBuilder) BACnetConstructedDataEventParametersBuilder {
-	builder := builderSupplier(m.EventParameter.CreateBACnetEventParameterBuilder())
-	var err error
-	m.EventParameter, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetEventParameterBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataEventParametersBuilder) Build() (BACnetConstructedDataEventParameters, error) {
 	if m.EventParameter == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
index be6b3b56688..af862119f0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
index 5b26ea7441b..d3fca37a3ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventTimeStamps.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
index f27b1efda60..18348d49874 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataEventType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
index 8360338c842..b1798d2560a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExceptionSchedule.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
index fd63e563f08..69d771ece8f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExecutionDelay.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
index 7e428743dab..686c77b89ea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExitPoints.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
index 2bd981c6a1a..dfe31e2b16d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpectedShedLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataExpectedShedLevelBuilder interface {
 	WithMandatoryFields(expectedShedLevel BACnetShedLevel) BACnetConstructedDataExpectedShedLevelBuilder
 	// WithExpectedShedLevel adds ExpectedShedLevel (property field)
 	WithExpectedShedLevel(BACnetShedLevel) BACnetConstructedDataExpectedShedLevelBuilder
-	// WithExpectedShedLevelBuilder adds ExpectedShedLevel (property field) which is build by the builder
-	WithExpectedShedLevelBuilder(func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataExpectedShedLevelBuilder
 	// Build builds the BACnetConstructedDataExpectedShedLevel or returns an error if something is wrong
 	Build() (BACnetConstructedDataExpectedShedLevel, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataExpectedShedLevelBuilder) WithExpectedShedLevel(e
 	return m
 }
 
-func (m *_BACnetConstructedDataExpectedShedLevelBuilder) WithExpectedShedLevelBuilder(builderSupplier func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataExpectedShedLevelBuilder {
-	builder := builderSupplier(m.ExpectedShedLevel.CreateBACnetShedLevelBuilder())
-	var err error
-	m.ExpectedShedLevel, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetShedLevelBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataExpectedShedLevelBuilder) Build() (BACnetConstructedDataExpectedShedLevel, error) {
 	if m.ExpectedShedLevel == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
index a9591e7986b..f069fe85d31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExpirationTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
index cd67959d12e..8b6639c5c91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataExtendedTimeEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
index 8a967892214..f0f67a94a60 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDBBMDAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
index 2df5f548875..27e2a46ebe7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFDSubscriptionLifetime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
index 6f8a5c0a2e8..df4950413f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptEvents.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
index cdaa0b931b7..6b890c4fc69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttempts.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
index 7820f08cafd..dc6bb530055 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFailedAttemptsTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
index d4c5e25bdfc..5da088e548e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
index a3db89cdf4d..1e503248d60 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
index 5ea6677d560..453c77c7bf6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataFaultParametersBuilder interface {
 	WithMandatoryFields(faultParameters BACnetFaultParameter) BACnetConstructedDataFaultParametersBuilder
 	// WithFaultParameters adds FaultParameters (property field)
 	WithFaultParameters(BACnetFaultParameter) BACnetConstructedDataFaultParametersBuilder
-	// WithFaultParametersBuilder adds FaultParameters (property field) which is build by the builder
-	WithFaultParametersBuilder(func(BACnetFaultParameterBuilder) BACnetFaultParameterBuilder) BACnetConstructedDataFaultParametersBuilder
 	// Build builds the BACnetConstructedDataFaultParameters or returns an error if something is wrong
 	Build() (BACnetConstructedDataFaultParameters, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataFaultParametersBuilder) WithFaultParameters(fault
 	return m
 }
 
-func (m *_BACnetConstructedDataFaultParametersBuilder) WithFaultParametersBuilder(builderSupplier func(BACnetFaultParameterBuilder) BACnetFaultParameterBuilder) BACnetConstructedDataFaultParametersBuilder {
-	builder := builderSupplier(m.FaultParameters.CreateBACnetFaultParameterBuilder())
-	var err error
-	m.FaultParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetFaultParameterBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataFaultParametersBuilder) Build() (BACnetConstructedDataFaultParameters, error) {
 	if m.FaultParameters == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
index dbe5f6d8113..36fce0d29b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultSignals.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
index c9470f1e888..05f2741e4f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
index b1b9564ec48..d20b9721402 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
index c0828f14660..1db05371933 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAccessMethod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
index a91d09f537d..3e8fac94530 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
index 3ec52dc9edb..c20b7821cc0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileRecordCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
index 29744d8a0eb..71a31496165 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileSize.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
index c191a2d90c7..8b5911fe415 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFileType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
index 01b698be5ae..793fb4eeb7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFirmwareRevision.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
index d414075574b..cdc76893a86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFloorText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
index 0a1a1826bfa..6384ba512c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataFullDutyBaseline.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
index e7f519890a6..00dfd3f13b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
index 21a9219cf16..cf4223aac55 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupGroupMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
index ab1eb77eaa1..c1b1e95f48c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalGroupPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
index 87752e1316d..0545e8789fd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGlobalIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
index aef9a1be2c1..6586bcd0d3e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
index f2c450eb9c3..79da1e1267f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
index be58ad28236..16469396b38 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMemberNames.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
index cd3b72260ba..e067b93eaf7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
index 98844cdf2c1..4379569fde5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
index a3ac63a7484..59d8c55afb8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataGroupPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
index cf9c1237b88..9a24b397f79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
index f85813c89e8..f4bbf97bba3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataHigherDeck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
index ee153dd1a7c..9c9bab384a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
index a436c5827e6..a83939d3ebc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
index f2eaa897e49..e72011df814 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
index 1a38926adf4..464859e2648 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPLeaseTimeRemaining.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
index a7f38ceb24c..e44769f397d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDHCPServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
index 618aa91262e..8cbdf378462 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDNSServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
index c1714f68bac..15e9bc4ebf8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPDefaultGateway.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
index 3d37ed2e7ef..d85f81f52ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPSubnetMask.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
index d2f60429049..95d91dd849b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6Address.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
index 4c83eecd958..66231a2b989 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6AutoAddressingEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
index 46ed20876ed..afa3ca389b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
index 54bcc045205..285a7bcb9c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPLeaseTimeRemaining.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
index 942ec066eed..8fad73fe9b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DHCPServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
index 70d7e2d94fd..4dbbbe919ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DNSServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
index 524b61a97ee..33f77d589ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6DefaultGateway.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
index 2fa63b77b7b..ddcfea7add7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6PrefixLength.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
index bfb877d4bf5..a07ebf76ded 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIPv6ZoneIndex.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
index 6c362e6a03f..d93224dd1ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProcess.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
index 344fafb0d4c..9448a81d082 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInProgress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
index ae252506dae..30d42ad4ea1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInactiveText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
index c402d70b172..48613d4ddf5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInitialTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
index b25b1c51887..b68f2dcec2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInputReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
index d1f277043a8..e20800fc8c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstallationID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
index abfc7f6f5a6..b5a0a5db147 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstanceOf.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
index 58b1e2abf37..24b62305982 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataInstantaneousPower.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
index b6a37d87d55..d4ecf7cc952 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
index 64c5c25eea7..5a95c57ef20 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueCOVIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
index 2ca274561c4..b789a574918 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueDeadband.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
index f57f2fb94e4..750b0696482 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
index ff1b5e68f67..a2682eddeb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
index 20caa0205bb..f2b33dbb98a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
index 392bdd94e64..7c90cd2b314 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
index f3d74a0588b..15edbbfd03b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
index 6c4b6617ccb..ac409666fbd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
index fea8111421d..0739d203186 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
index 191f35b05b0..e19b907e8d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
index 239bc061f46..2dcff9ca3d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegerValueResolution.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
index da92eba17e0..0005d000461 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstant.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
index c7575d404d6..fbe1890df18 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntegralConstantUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
index a73a339738c..0ac021a55ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIntervalOffset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
index 4144eb71f3e..a01372e4efe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataIsUTC.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
index cdb19241fb5..8e63cb76947 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataKeySets.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
index 77b810166c7..b55eeed0797 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCallControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
index cab4f8a7171..94e3b345d24 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingCalls.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
index aa3c0d05bfc..a759b5e0b77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLandingDoorStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
index 70f7a2a3eb6..c855e926110 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
index a54f887328e..f2d65daa1c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueCOVIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
index 423b213ec79..305231d3062 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueDeadband.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
index 4c34ed0ef32..e0da33a302c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
index b1af1c7e432..441768a822b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
index ecc72a93709..72556ab5e18 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
index 3d0b918495c..2c69c8ee061 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
index 00fcb5d11cd..714d9d78351 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
index 9c0ca309f24..04a36643077 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
index f55a432ce47..6e627ac78ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
index 93d291d88d1..f74ecbaffc9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
index 0057c88a04e..6a4072f65ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLargeAnalogValueResolution.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
index e31c7b1d1ed..94f455bebfb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
index 492097f9440..7dc7bdff0cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastAccessPoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
index d7dfc354210..31e23ab19fd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCommandTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataLastCommandTimeBuilder interface {
 	WithMandatoryFields(lastCommandTime BACnetTimeStamp) BACnetConstructedDataLastCommandTimeBuilder
 	// WithLastCommandTime adds LastCommandTime (property field)
 	WithLastCommandTime(BACnetTimeStamp) BACnetConstructedDataLastCommandTimeBuilder
-	// WithLastCommandTimeBuilder adds LastCommandTime (property field) which is build by the builder
-	WithLastCommandTimeBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataLastCommandTimeBuilder
 	// Build builds the BACnetConstructedDataLastCommandTime or returns an error if something is wrong
 	Build() (BACnetConstructedDataLastCommandTime, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataLastCommandTimeBuilder) WithLastCommandTime(lastC
 	return m
 }
 
-func (m *_BACnetConstructedDataLastCommandTimeBuilder) WithLastCommandTimeBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataLastCommandTimeBuilder {
-	builder := builderSupplier(m.LastCommandTime.CreateBACnetTimeStampBuilder())
-	var err error
-	m.LastCommandTime, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataLastCommandTimeBuilder) Build() (BACnetConstructedDataLastCommandTime, error) {
 	if m.LastCommandTime == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
index 0d96943c8fd..ef76ad382d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAdded.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
index 2a85e3dceaa..c8db0a42655 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialAddedTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
index f2bac830547..1339123d011 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemoved.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
index e67d480a26d..dfbc14ce187 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastCredentialRemovedTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
index 90609bcc45b..d960bbce0c2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastKeyServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
index 30a0498ee3c..385e8d5f8a6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastNotifyRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
index 13993f2d986..3cbc2032b5f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastPriority.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
index 7474c80963b..3ea23aee058 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestartReason.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
index 9ddee3ac3d0..136b8a1d914 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastRestoreTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataLastRestoreTimeBuilder interface {
 	WithMandatoryFields(lastRestoreTime BACnetTimeStamp) BACnetConstructedDataLastRestoreTimeBuilder
 	// WithLastRestoreTime adds LastRestoreTime (property field)
 	WithLastRestoreTime(BACnetTimeStamp) BACnetConstructedDataLastRestoreTimeBuilder
-	// WithLastRestoreTimeBuilder adds LastRestoreTime (property field) which is build by the builder
-	WithLastRestoreTimeBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataLastRestoreTimeBuilder
 	// Build builds the BACnetConstructedDataLastRestoreTime or returns an error if something is wrong
 	Build() (BACnetConstructedDataLastRestoreTime, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataLastRestoreTimeBuilder) WithLastRestoreTime(lastR
 	return m
 }
 
-func (m *_BACnetConstructedDataLastRestoreTimeBuilder) WithLastRestoreTimeBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataLastRestoreTimeBuilder {
-	builder := builderSupplier(m.LastRestoreTime.CreateBACnetTimeStampBuilder())
-	var err error
-	m.LastRestoreTime, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataLastRestoreTimeBuilder) Build() (BACnetConstructedDataLastRestoreTime, error) {
 	if m.LastRestoreTime == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
index c4afe164bbf..98cded634c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastStateChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
index e16ad2cb1b6..2493f4867bb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLastUseTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
index 1f627d78d9e..6bfc3847769 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
index c8f25a8060a..3e06c6df280 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
index 5ca6e25a96c..6f4fea05e93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
index 5b107dd878f..35a6c14a4d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
index fa64e317f29..79ec5edeb76 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyPointPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
index 7f044e5e7d2..a9d2748443b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
index 5e87109fbff..5fe22195b97 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
index 55978d30982..910b7085af8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
index 8469705c611..28c06870bbd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZoneMaintenanceRequired.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
index 0a093867b91..d723bd91e8c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZonePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
index a6b383ac4d1..4fab33da853 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
index f8f32209060..86475c55544 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLiftFaultSignals.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
index 424037c3ae3..3a77834edc7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
index 09da2ab8d4a..f47d6cb907e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingCommandDefaultPriority.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
index e96a4b2055e..57dfe920c69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
index 305f1e4a1dd..6f8a30aa368 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputFeedbackValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
index e96690ed71b..6f2917b61f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
index e2ce3d9f241..b0bcec094c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
index 4f90d74f19a..0ecaf8a74f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLightingOutputTrackingValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
index 5f202826bb9..8e8b48cf65d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
index 6e099ee6ac3..1e48355e7d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLimitMonitoringInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
index 6908d1c3ce8..b8ba5312b0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
index 0fbac6dd67b..90564ec67cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeedAutonegotiate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
index c0e9624cd4d..6224bf52516 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLinkSpeeds.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
index e4a4d307275..3b286b9a9a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfGroupMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
index 0c397ce061b..e99026eedc9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataListOfObjectPropertyReferences.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
index c13461d74a4..6ae8c173085 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
index 5985cc0df99..0464c2aa872 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoadControlPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
index 5f7ea6a3558..148c9552302 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
index 95b57923c5e..cd819abe7ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalForwardingOnly.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
index decf730ef4d..04070e3aa52 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocalTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
index 7a59a68eede..877c4b42e88 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLocation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
index 519ec547fb3..7b42d66ee48 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
index 7d8dad1b5ac..e8092e1a317 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
index 1706bc5b175..b3646cf58b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLockoutRelinquishTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
index 500f25194b1..287fb11ce69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogBuffer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
index 13ea5f91894..35543eb6da5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogDeviceObjectProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
index 66d43bad2e6..c994a3f9074 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLogInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
index 788ad019739..498a0585cdf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
index 76c9f7fc861..6db8936aa8f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
index 086df262910..474ceb3c929 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoggingType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
index c6e2e533144..efaeece3d13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAction.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
index 01984fef43f..90d96be1094 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
index b2781cca89b..f941a6de56e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLoopPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
index 11dfc741c41..15edfcd3afa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowDiffLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataLowDiffLimitBuilder interface {
 	WithMandatoryFields(lowDiffLimit BACnetOptionalREAL) BACnetConstructedDataLowDiffLimitBuilder
 	// WithLowDiffLimit adds LowDiffLimit (property field)
 	WithLowDiffLimit(BACnetOptionalREAL) BACnetConstructedDataLowDiffLimitBuilder
-	// WithLowDiffLimitBuilder adds LowDiffLimit (property field) which is build by the builder
-	WithLowDiffLimitBuilder(func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataLowDiffLimitBuilder
 	// Build builds the BACnetConstructedDataLowDiffLimit or returns an error if something is wrong
 	Build() (BACnetConstructedDataLowDiffLimit, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataLowDiffLimitBuilder) WithLowDiffLimit(lowDiffLimi
 	return m
 }
 
-func (m *_BACnetConstructedDataLowDiffLimitBuilder) WithLowDiffLimitBuilder(builderSupplier func(BACnetOptionalREALBuilder) BACnetOptionalREALBuilder) BACnetConstructedDataLowDiffLimitBuilder {
-	builder := builderSupplier(m.LowDiffLimit.CreateBACnetOptionalREALBuilder())
-	var err error
-	m.LowDiffLimit, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalREALBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataLowDiffLimitBuilder) Build() (BACnetConstructedDataLowDiffLimit, error) {
 	if m.LowDiffLimit == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
index 493f6ed5743..47eca7e7334 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
index fb671538b02..2d23bf8fb6f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataLowerDeck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
index 4e12a517f5c..4dd4758efcd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMACAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
index 2b3dbf2ffbd..b6aeff756af 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMachineRoomID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
index c36a57360ce..9ac81518bc4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaintenanceRequired.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
index 6431b932d97..4fe5152d583 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMakingCarCall.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
index 2c4373718f2..a73a6cd56ea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManipulatedVariableReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
index 6c1ed96e825..fb8704e3f7f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataManualSlaveAddressBinding.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
index 1dc5eac0bcf..26900f9a7d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaskedAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
index 6dc434f4180..0607283f2ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxAPDULengthAccepted.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
index 4ebdf9d4c4d..94bb276099b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxActualValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
index 6a36d9fee0f..7756ca225b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxFailedAttempts.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
index 5a64b0ce104..62bef97d089 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxInfoFrames.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
index 9f676c2cfe5..578e1f62e3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxMaster.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
index 59ab261e6ad..68a01edb36e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
index 689c2351a8d..fc1dca3ccea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaxSegmentsAccepted.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
index 13bc5fe677d..45b888a0472 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumOutput.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
index e65abe7bf78..f7af94c2391 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
index f446464963d..22c9fb7bdac 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMaximumValueTimestamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
index de734dfae33..9ef90d142e5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberOf.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
index e39c70636ea..23a4193997e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMemberStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
index 92758e4d445..8ba395c847a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
index 3e40495e4b1..9726e89ac6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinActualValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
index 1297bc37a8d..50861e49ed0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
index b2f8ad59894..f6c744ba4f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOffTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
index 0d21e91d917..a4f1a60a58c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOnTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
index 032f00e1189..e7bf5fbe237 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumOutput.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
index 823f6a49d72..a42e8b7b362 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
index 9900a380d1a..15ce73aefdd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMinimumValueTimestamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
index 5428854e1dc..6380be5d0a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
index 212780defd1..c7ea1ea0567 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModelName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
index 519a19c7776..162d54064e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataModificationDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
index 57888962c60..ef8752b1783 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
index f57e94860e6..e4e1f5940dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
index e2f4181bed4..4ebccdb5744 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
index 5f4edb17f66..fc87ed2940a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateInputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataMultiStateInputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalBinaryPV) BACnetConstructedDataMultiStateInputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalBinaryPV) BACnetConstructedDataMultiStateInputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataMultiStateInputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataMultiStateInputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataMultiStateInputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataMultiStateInputInterfaceValueBuilder) WithInterfa
 	return m
 }
 
-func (m *_BACnetConstructedDataMultiStateInputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataMultiStateInputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalBinaryPVBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalBinaryPVBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataMultiStateInputInterfaceValueBuilder) Build() (BACnetConstructedDataMultiStateInputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
index be8318f7a03..badac116e36 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
index e7e55c9d9d7..79a30ae1468 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputFeedbackValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
index 12e855a559a..9af7e3572ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputInterfaceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataMultiStateOutputInterfaceValueBuilder interface {
 	WithMandatoryFields(interfaceValue BACnetOptionalBinaryPV) BACnetConstructedDataMultiStateOutputInterfaceValueBuilder
 	// WithInterfaceValue adds InterfaceValue (property field)
 	WithInterfaceValue(BACnetOptionalBinaryPV) BACnetConstructedDataMultiStateOutputInterfaceValueBuilder
-	// WithInterfaceValueBuilder adds InterfaceValue (property field) which is build by the builder
-	WithInterfaceValueBuilder(func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataMultiStateOutputInterfaceValueBuilder
 	// Build builds the BACnetConstructedDataMultiStateOutputInterfaceValue or returns an error if something is wrong
 	Build() (BACnetConstructedDataMultiStateOutputInterfaceValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataMultiStateOutputInterfaceValueBuilder) WithInterf
 	return m
 }
 
-func (m *_BACnetConstructedDataMultiStateOutputInterfaceValueBuilder) WithInterfaceValueBuilder(builderSupplier func(BACnetOptionalBinaryPVBuilder) BACnetOptionalBinaryPVBuilder) BACnetConstructedDataMultiStateOutputInterfaceValueBuilder {
-	builder := builderSupplier(m.InterfaceValue.CreateBACnetOptionalBinaryPVBuilder())
-	var err error
-	m.InterfaceValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetOptionalBinaryPVBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataMultiStateOutputInterfaceValueBuilder) Build() (BACnetConstructedDataMultiStateOutputInterfaceValue, error) {
 	if m.InterfaceValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
index 738b67f5dd8..8e48f13061a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateOutputRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
index ff1979db3dd..01ca205015a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
index b94c8b66d2d..1b39d84210c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
index 06fb9876b41..1e140713217 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
index 0ffe9567785..9db2d014214 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMultiStateValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
index 6d82897406b..07e1f294a6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataMusterPoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
index eb031a6000a..572b38e0c09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNegativeAccessRules.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
index 4bb750e2210..f058b5bcd6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkAccessSecurityPolicies.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
index 8ba4b5c7f77..2b9b8da24fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkInterfaceName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
index c53155657e2..3c1c2edcdf1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
index d6a7e766621..066998b8bae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkNumberQuality.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
index ea95ac49b47..e8584383952 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
index c0d2db7c987..7813fbe8aeb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxInfoFrames.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
index 7159046a7dd..aa588656d7b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkPortMaxMaster.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
index 71c04819757..72cc9b35f60 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkSecurityAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
index 3d9f1c49577..4aa2923784b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNetworkType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
index 4c38a5f3539..f2674fd711e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNextStoppingFloor.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
index 6889581f0ed..6f669217d75 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeSubtype.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
index 40ded40f37b..757ba50a617 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNodeType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
index cea01e9b2fe..b8e155e7688 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClass.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
index 83db76bec91..fb7220daa78 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationClassAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
index b4130895084..74c7c65a81b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationForwarderAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
index 0ab2456c95a..898c7c6742a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotificationThreshold.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
index 25581f1a542..1add1a829a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNotifyType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
index b5803eb956c..f9ae60e4da2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAPDURetries.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
index 6802999eb92..50eef865882 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfAuthenticationPolicies.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
index 9feb4a9c44e..e5610ba8ff8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataNumberOfStates.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
index 8ca4d092ce0..8895c3be263 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
index b35d53032be..554ff1ff983 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
index 8aa40c7d095..2cff5f8ebaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
index c6a1ddfc5fe..ff843fc65fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectPropertyReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
index c5278af86b7..a5a98af191b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataObjectType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
index a7cd7613e4c..e9c8fac0a28 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
index d2548ffefa2..789c27e0238 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountAdjust.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
index e186c9fe549..6abfc571e15 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyCountEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
index 50ae478e621..3a4e75ac8f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
index fed2b71a7b1..deeb1d49090 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyLowerLimitEnforced.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
index 4f7c7a12388..7f8a9193f79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
index d9d4fcaaf4d..252f48bb0a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
index c6d38556394..190cac26334 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOccupancyUpperLimitEnforced.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
index aa5113df5af..89c80a582ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
index ed490234ad5..cb78b199ef8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetStringValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
index 4158eb33218..4f9f4696bdc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOctetstringValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
index 9b87cdbba27..669e34ed9cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
index 591486277b4..c88a9f64dda 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOperationExpected.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
index 184821a338b..dac4cbc3a08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOptional.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
index 09698aa8580..f1b597588f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutOfService.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
index 12f63a65ae5..d251254d4e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataOutputUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
index fccbb7ab2e2..d89fc62f42d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPacketReorderTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
index 29b8e574c3c..4b204b4a0f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
index f96ba2d9a90..825ad509655 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassbackTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
index a580d76d114..f2cd91d94b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPassengerAlarm.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
index e1c70284b1d..b6498a5471c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPolarity.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
index 1789d07550f..e2f7b45ba8a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPortFilter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
index 870c724b1ac..7d3458092b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveAccessRules.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
index 589b3928d3f..e08e72d3717 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
index e5b00282420..f14433ea401 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueCOVIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
index c45e3045f12..5954c668e7b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueDeadband.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
index 18d5e9a1769..3132932a279 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
index a736c31e89e..83ec6f172a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueFaultLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
index 7532c4305ef..6241b631708 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueHighLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
index 792149b10a8..691d3894b4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueLowLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
index fa88b0bfb22..1930fe737f4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
index 52a8be9ccf4..b91eda7f747 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
index 0fec0331cc4..f447a64ee51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
index f4d971a5358..57f764c42cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPositiveIntegerValueResolution.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
index 246ef2a8986..bae29529aa4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPower.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
index 9019fa61aa7..5bfd077e9ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPowerMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
index 9dd78bba173..ed77439cca7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPrescale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
index b829d36a6d6..869159a3ba1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
index e0659fe1231..37a727b5a93 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriority.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
index 22d7ab41d22..9571e39bcee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityArray.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
index 8378f02e133..57d25c91aeb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPriorityForWriting.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
index f8479bdf87a..0c7e7bbace2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
index 411aa8b59bf..29e71a50069 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProcessIdentifierFilter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataProcessIdentifierFilterBuilder interface {
 	WithMandatoryFields(processIdentifierFilter BACnetProcessIdSelection) BACnetConstructedDataProcessIdentifierFilterBuilder
 	// WithProcessIdentifierFilter adds ProcessIdentifierFilter (property field)
 	WithProcessIdentifierFilter(BACnetProcessIdSelection) BACnetConstructedDataProcessIdentifierFilterBuilder
-	// WithProcessIdentifierFilterBuilder adds ProcessIdentifierFilter (property field) which is build by the builder
-	WithProcessIdentifierFilterBuilder(func(BACnetProcessIdSelectionBuilder) BACnetProcessIdSelectionBuilder) BACnetConstructedDataProcessIdentifierFilterBuilder
 	// Build builds the BACnetConstructedDataProcessIdentifierFilter or returns an error if something is wrong
 	Build() (BACnetConstructedDataProcessIdentifierFilter, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataProcessIdentifierFilterBuilder) WithProcessIdenti
 	return m
 }
 
-func (m *_BACnetConstructedDataProcessIdentifierFilterBuilder) WithProcessIdentifierFilterBuilder(builderSupplier func(BACnetProcessIdSelectionBuilder) BACnetProcessIdSelectionBuilder) BACnetConstructedDataProcessIdentifierFilterBuilder {
-	builder := builderSupplier(m.ProcessIdentifierFilter.CreateBACnetProcessIdSelectionBuilder())
-	var err error
-	m.ProcessIdentifierFilter, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetProcessIdSelectionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataProcessIdentifierFilterBuilder) Build() (BACnetConstructedDataProcessIdentifierFilter, error) {
 	if m.ProcessIdentifierFilter == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
index 714ce4f9d59..fe85d35c2e7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileLocation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
index 8aba3520b83..417294097be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProfileName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
index 03af7b52b3f..4ed706e8bfa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
index 24caa26f011..0b43e1374c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
index 9a51a7451f0..77f6b71ed54 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramLocation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
index ec8ed3121bb..43da6e26e66 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProgramState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
index 83524492836..6f8400af4ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPropertyList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
index 8e6a9f0d1f0..0bfe9f0d39d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstant.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
index 81ac268a7c9..38ac46a4331 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProportionalConstantUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
index 10fe58fa551..ec9070f613c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
index 590f709cd75..8b1abc2fe23 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolObjectTypesSupported.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
index c58d1a8db15..e883e4b5b94 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolRevision.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
index a7df3d340e2..352316a13bd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolServicesSupported.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
index 8d6c7763e9f..21268337291 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataProtocolVersion.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
index a60d3380881..38b3f618445 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAdjustValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
index c58ffc9a931..a935abe12fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
index 66e57abc7ac..1d6b6160f3e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseConverterPresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
index c9dac0b0499..ff77dbede56 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataPulseRate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
index 1a9ff9dc87d..d1b5dd05552 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReadOnly.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
index c079703da95..4bca8b748cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForDisable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
index a7d9d2823e7..e02c5a7fd42 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReasonForHalt.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
index 487e60438d1..b3698835c76 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecipientList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
index fce11389558..8ba52e96a83 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
index bbe456470ed..9aa47bea710 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRecordsSinceNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
index 2fbeaee4986..76f99c99b5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReferencePort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
index d361782ebcc..6f5acbc095b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRegisteredCarCall.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
index ba7cc10b5fc..21404a4042a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliability.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
index 28717b74247..af51142d531 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataReliabilityEvaluationInhibit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
index cc99d7868f1..5b282df5d79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
index 6fb9c8158b3..654da830077 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRepresents.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
index 30124341758..4f01f6e1f2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedShedLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataRequestedShedLevelBuilder interface {
 	WithMandatoryFields(requestedShedLevel BACnetShedLevel) BACnetConstructedDataRequestedShedLevelBuilder
 	// WithRequestedShedLevel adds RequestedShedLevel (property field)
 	WithRequestedShedLevel(BACnetShedLevel) BACnetConstructedDataRequestedShedLevelBuilder
-	// WithRequestedShedLevelBuilder adds RequestedShedLevel (property field) which is build by the builder
-	WithRequestedShedLevelBuilder(func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataRequestedShedLevelBuilder
 	// Build builds the BACnetConstructedDataRequestedShedLevel or returns an error if something is wrong
 	Build() (BACnetConstructedDataRequestedShedLevel, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataRequestedShedLevelBuilder) WithRequestedShedLevel
 	return m
 }
 
-func (m *_BACnetConstructedDataRequestedShedLevelBuilder) WithRequestedShedLevelBuilder(builderSupplier func(BACnetShedLevelBuilder) BACnetShedLevelBuilder) BACnetConstructedDataRequestedShedLevelBuilder {
-	builder := builderSupplier(m.RequestedShedLevel.CreateBACnetShedLevelBuilder())
-	var err error
-	m.RequestedShedLevel, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetShedLevelBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataRequestedShedLevelBuilder) Build() (BACnetConstructedDataRequestedShedLevel, error) {
 	if m.RequestedShedLevel == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
index 9b6021a7a7b..caa16782a86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequestedUpdateInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
index 34c4b393ec4..1fe4ee37cb9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRequired.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
index 43664aa2398..ea81a3915d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataResolution.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
index 39166bfebee..8a15e2c6adf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestartNotificationRecipients.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
index 761896ba9c1..8bcdedc42e6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestoreCompletionTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
index 0288b6b34cd..8f9755af073 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRestorePreparationTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
index 8ff0158d1fc..709b9941aa9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataRoutingTable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
index a46c90da2fa..b45c074999b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataScaleBuilder interface {
 	WithMandatoryFields(scale BACnetScale) BACnetConstructedDataScaleBuilder
 	// WithScale adds Scale (property field)
 	WithScale(BACnetScale) BACnetConstructedDataScaleBuilder
-	// WithScaleBuilder adds Scale (property field) which is build by the builder
-	WithScaleBuilder(func(BACnetScaleBuilder) BACnetScaleBuilder) BACnetConstructedDataScaleBuilder
 	// Build builds the BACnetConstructedDataScale or returns an error if something is wrong
 	Build() (BACnetConstructedDataScale, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataScaleBuilder) WithScale(scale BACnetScale) BACnet
 	return m
 }
 
-func (m *_BACnetConstructedDataScaleBuilder) WithScaleBuilder(builderSupplier func(BACnetScaleBuilder) BACnetScaleBuilder) BACnetConstructedDataScaleBuilder {
-	builder := builderSupplier(m.Scale.CreateBACnetScaleBuilder())
-	var err error
-	m.Scale, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetScaleBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataScaleBuilder) Build() (BACnetConstructedDataScale, error) {
 	if m.Scale == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
index 46fae8ee84f..2f667e555f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScaleFactor.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
index 0b0a7c7f02a..e22d05c76e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
index a608aa8a65b..3a2722a0766 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataScheduleDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
index 3c481a4acd0..79f305da317 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSchedulePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
index be571da7bc8..dc8aa71ae44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecuredStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
index 4a4620f3777..5715f407b81 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityPDUTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
index cea5a3110e0..294bf10c0a7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSecurityTimeWindow.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
index 19edc638170..3662a40fd27 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSegmentationSupported.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
index a1dfba1aee9..acb0c09598a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSerialNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
index 7903e2c49fb..2b0e9082c32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
index 9ac14030ba8..34cd6993338 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetpointReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
index c8b4418e1e7..e7b4e001e48 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSetting.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
index b1ba052b6dd..84b0155ee88 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedDuration.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
index 3de39ff9fa7..eaa7605fa6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevelDescriptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
index a548ad306f3..194aa4e298a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataShedLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
index f02a93cfea0..105d89e1f76 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSilenced.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
index cb7e86dadcf..b614b6796b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveAddressBinding.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
index 8ca2cf86555..a74cee5da9e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSlaveProxyEnable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
index 1b0ba9eff3a..3e2381c04bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStartTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
index 1fbeec0bb3b..eb2633167e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateChangeValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
index f8bc241f203..57967842491 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
index 48d76d8252c..9f3c9bb45ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStateText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
index 219831f7f42..db08cda096c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
index 5963c9f80d5..779b7019745 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
index 27ebd25c818..924c46bf62a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStopWhenFull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
index 6c4edaab158..d3d9ccb1615 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStrikeCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
index d15723a17a6..810213ca59e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredObjectList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
index 92f55f7e3ae..2b1ff0420cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataStructuredViewAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
index 86ac438339e..88f332e94a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateAnnotations.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
index 55c8ca6a282..17834996a97 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
index c254f9ce2e0..0668c42cd2a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateNodeTypes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
index 2406bfa9a75..644bb6f128f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateRelationships.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
index 33ba36e61e7..d6541af5e05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubordinateTags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
index 204a9be51b2..4bfc2cfc3d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSubscribedRecipients.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
index c496b5aded8..52ea897aca5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormatClasses.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
index 465500e23cc..e94982e8152 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedFormats.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
index 58e73acdc8d..79b03d11d90 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSupportedSecurityAlgorithms.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
index 83a79a0e61c..a6df84add0c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataSystemStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
index 60820783ae0..6d11db1a888 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
index 06833aebebd..17ceb79c6cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatAuthority.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
index 48da1ad4a32..8c84954a7ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataThreatLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
index d5f022db39a..42a722c3161 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelay.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
index d104f3e1777..2f222975f41 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeDelayNormal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
index fc0f797873d..6219e86a4fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfActiveTimeReset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
index 80778bc34ca..d507321c2e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfDeviceRestart.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataTimeOfDeviceRestartBuilder interface {
 	WithMandatoryFields(timeOfDeviceRestart BACnetTimeStamp) BACnetConstructedDataTimeOfDeviceRestartBuilder
 	// WithTimeOfDeviceRestart adds TimeOfDeviceRestart (property field)
 	WithTimeOfDeviceRestart(BACnetTimeStamp) BACnetConstructedDataTimeOfDeviceRestartBuilder
-	// WithTimeOfDeviceRestartBuilder adds TimeOfDeviceRestart (property field) which is build by the builder
-	WithTimeOfDeviceRestartBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataTimeOfDeviceRestartBuilder
 	// Build builds the BACnetConstructedDataTimeOfDeviceRestart or returns an error if something is wrong
 	Build() (BACnetConstructedDataTimeOfDeviceRestart, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataTimeOfDeviceRestartBuilder) WithTimeOfDeviceResta
 	return m
 }
 
-func (m *_BACnetConstructedDataTimeOfDeviceRestartBuilder) WithTimeOfDeviceRestartBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetConstructedDataTimeOfDeviceRestartBuilder {
-	builder := builderSupplier(m.TimeOfDeviceRestart.CreateBACnetTimeStampBuilder())
-	var err error
-	m.TimeOfDeviceRestart, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataTimeOfDeviceRestartBuilder) Build() (BACnetConstructedDataTimeOfDeviceRestart, error) {
 	if m.TimeOfDeviceRestart == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
index eca6e7d937e..2481bbacbdc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStateCountReset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
index 5f66dbc81e4..6d640e67241 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeOfStrikeCountReset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
index 50c172e0f0a..76e9cca94bf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
index 7f381c68dcf..48b6acfde99 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimePatternValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
index 3e2f7e1ab6d..20e1e6e6add 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
index c3edb0838ba..884b47d4806 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeSynchronizationRecipients.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
index f4abdbe5af0..6262a39746a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
index 8c4be41b0c3..9f0a1a731ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValuePresentValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
index c00ed11c0bc..0838a7fddf0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimeValueRelinquishDefault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
index 8680a48caf0..a1feb7ee1e8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimepatternValueAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
index 1efa83cdca4..bd5a086b34a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
index 722ab8cd782..256fddf6cc2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
index 9df1d995c42..ae5b2fe54d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMaxPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
index 59902493090..24985ceb74d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerMinPresValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
index 074888d4276..69ede3c2ed8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerResolution.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
index f6eed526b33..29c743e74c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerRunning.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
index e9a10634e6f..8b5c7548022 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTimerState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
index 8a4b2a7187f..c063b0f677c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTotalRecordCount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
index 10bd69d97a4..b3f87c80a2b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTraceFlag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
index 8472e7955aa..3bb504dd3e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrackingValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
index 06b3b9ecbaf..371eecba799 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransactionNotificationClass.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
index c905330b42e..1ef97b86628 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTransition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
index 0346174ffa4..dd0ef92d967 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
index e3ff5c30c6f..febc52d4d31 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogBuffer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
index b36f982433b..928346bfc6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogLogDeviceObjectProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
index 7efa9ece4cc..aea80fba2ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleAll.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
index 003451b6b37..988f4c27917 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogBuffer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
index 069d73d4e0a..1fd9d90a3fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrendLogMultipleLogDeviceObjectProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
index b29f108e8de..bbfa98c2676 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataTrigger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
index 86b031cfbd3..f19265eef12 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCOffset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
index 113b33a6d82..e636b295e84 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUTCTimeSynchronizationRecipients.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
index 76006a2a202..47a814d1643 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
index 53289aaaebe..2227f12bada 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
index 7666ad88b95..39410073d5c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
index ae60cd19c7e..f9d91403e7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateKeySetTimeout.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
index d6d80bba9a7..5429ba57819 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUpdateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
index fe04ba01b1f..0cdf08a3dbe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserExternalIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
index 7c6a9d4c8ab..4d33b04a391 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserInformationReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
index 4d74dc8322c..e3004af1255 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
index 59388012047..baf557a1605 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUserType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
index 13e7935bfb5..0b042a6f625 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataUsesRemaining.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
index 31ed162868e..8e2f5b88635 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVTClassesSupported.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
index 6a9fd2680e7..8f8925f7d32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValidSamples.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
index 138175f85de..89099085814 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueBeforeChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
index af3b151a698..a8e12c5be5e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueChangeTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
index d513dfb8a98..0c3fdbfe374 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSet.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
index c067ccbd5d8..74387a6f843 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSource.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetConstructedDataValueSourceBuilder interface {
 	WithMandatoryFields(valueSource BACnetValueSource) BACnetConstructedDataValueSourceBuilder
 	// WithValueSource adds ValueSource (property field)
 	WithValueSource(BACnetValueSource) BACnetConstructedDataValueSourceBuilder
-	// WithValueSourceBuilder adds ValueSource (property field) which is build by the builder
-	WithValueSourceBuilder(func(BACnetValueSourceBuilder) BACnetValueSourceBuilder) BACnetConstructedDataValueSourceBuilder
 	// Build builds the BACnetConstructedDataValueSource or returns an error if something is wrong
 	Build() (BACnetConstructedDataValueSource, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_BACnetConstructedDataValueSourceBuilder) WithValueSource(valueSource B
 	return m
 }
 
-func (m *_BACnetConstructedDataValueSourceBuilder) WithValueSourceBuilder(builderSupplier func(BACnetValueSourceBuilder) BACnetValueSourceBuilder) BACnetConstructedDataValueSourceBuilder {
-	builder := builderSupplier(m.ValueSource.CreateBACnetValueSourceBuilder())
-	var err error
-	m.ValueSource, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetValueSourceBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetConstructedDataValueSourceBuilder) Build() (BACnetConstructedDataValueSource, error) {
 	if m.ValueSource == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
index 0cdb0fdc337..61b3005d1c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataValueSourceArray.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
index 7a4bbe0e51f..917ba77c0ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVarianceValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
index a85220aafc1..8f990e10123 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
index fadef75778d..d79cb92eaf2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVendorName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
index f760d3a4bbc..63d9908c280 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVerificationTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
index 7830c49fd77..1f42dc5b4b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataVirtualMACAddressTable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
index e1f9e087753..24945b9762f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWeeklySchedule.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
index 0add76a7c78..f68d73bc7b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowInterval.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
index 200c0ee8205..e5fb3b940cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWindowSamples.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
index 6fc65b32588..f5b92afce7b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataWriteStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
index 0ddfda46536..3a56c1e52ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneFrom.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
index d34d7444755..a55db498aa7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneMembers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
index 60c9f4454d8..fc13b10c6cc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataZoneTo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
index f0c991c63bb..d19c79d0421 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
index 5b74c111f0e..ebc2b7cdec8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
index ce78960173f..5f986e6b6ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
index d8cdae780c8..07ab695d2ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
index ec3eeb86aed..6eb3369afdb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
index 7ddd77c0f7c..ff072b2165e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
index b87723e18c2..62c1528bd4f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
index 3380a590522..28749490652 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagNull.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
index bdf24d27449..a1ef2962451 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
index 4e7e84b1577..d01eceedbc8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
index 0f5ea8ef9ad..78e1726a66d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
index 9cc973e6bda..735babe5a74 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
index f6ce459565b..968f80538cd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
index db2603e1d9c..1bb7b783e39 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnknown.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
index 3397f46a2aa..81ae97be6a7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
index 30fa342d197..009c664916b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCredentialAuthenticationFactor.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
index 2cad0eab021..d9f8751f1d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDailySchedule.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
index 20fd9b1261a..c6cd8597738 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
index 0a683a5e178..47c3685968b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
index 78ef1a6d150..d2e3257a31e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateRangeEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
index 1540614580d..f3401b24c05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
index 4a5f2797456..c4477211ad8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDateTimeEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
index ecb07e48eb6..2849dccac25 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeek.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
index 4cb368fadc3..9394d18d104 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDaysOfWeekTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
index a4eef3d0c56..72f8542caea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDestination.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -120,8 +122,6 @@ type BACnetDestinationBuilder interface {
 	WithToTimeBuilder(func(BACnetApplicationTagTimeBuilder) BACnetApplicationTagTimeBuilder) BACnetDestinationBuilder
 	// WithRecipient adds Recipient (property field)
 	WithRecipient(BACnetRecipient) BACnetDestinationBuilder
-	// WithRecipientBuilder adds Recipient (property field) which is build by the builder
-	WithRecipientBuilder(func(BACnetRecipientBuilder) BACnetRecipientBuilder) BACnetDestinationBuilder
 	// WithProcessIdentifier adds ProcessIdentifier (property field)
 	WithProcessIdentifier(BACnetApplicationTagUnsignedInteger) BACnetDestinationBuilder
 	// WithProcessIdentifierBuilder adds ProcessIdentifier (property field) which is build by the builder
@@ -216,19 +216,6 @@ func (m *_BACnetDestinationBuilder) WithRecipient(recipient BACnetRecipient) BAC
 	return m
 }
 
-func (m *_BACnetDestinationBuilder) WithRecipientBuilder(builderSupplier func(BACnetRecipientBuilder) BACnetRecipientBuilder) BACnetDestinationBuilder {
-	builder := builderSupplier(m.Recipient.CreateBACnetRecipientBuilder())
-	var err error
-	m.Recipient, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetRecipientBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetDestinationBuilder) WithProcessIdentifier(processIdentifier BACnetApplicationTagUnsignedInteger) BACnetDestinationBuilder {
 	m.ProcessIdentifier = processIdentifier
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
index b91ec02f6f9..8e7aeaa841d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
index eff5b11b177..a1a3e78583d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReferenceEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
index 52389c7d0fa..c2186e7c557 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
index 606fb71c7a5..692f8566754 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceObjectReferenceEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
index ed739c3e663..9f23ed006ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
index 66dc012b63d..ec0beef4a9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDeviceStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
index 4e29c4ac1da..5b199e48f50 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
index ff9a505e990..78b59ca5297 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorAlarmStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
index 95a9fa4b8a3..be8168914e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
index 35cf4d17097..95090d42d4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorSecuredStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
index c6fdafcb620..8c731ccae0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
index c79b8f75b05..140d570987c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
index 2ec5f5b58d1..fee12bbcd7c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValue.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
index 59c4a6dad68..e87c8966145 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetDoorValueTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
index cb5daba8854..3c8ee003e61 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
index f592bc63618..ecd82ec899b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEngineeringUnitsTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
index d58dbe953e3..4e2917a2cd4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetError.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetErrorGeneral.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetErrorGeneral.go
index 824d581dca9..db4021fe58f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetErrorGeneral.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetErrorGeneral.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
index 271c0b191f6..269d008a331 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFault.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
index 3eab8c471c5..032be51bf22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorFaultTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
index 122ca1c0d70..a6bdc43fe87 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
index 1c1cfa507c7..2c9f6a61155 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
index bfbed6d468c..afc849fd97c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirection.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
index b8dd8c6a1fa..077fd3de60c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEscalatorOperationDirectionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
index 2fb4e1b38cc..cb9c81af14d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetEventLogRecordBuilder interface {
 	WithTimestampBuilder(func(BACnetDateTimeEnclosedBuilder) BACnetDateTimeEnclosedBuilder) BACnetEventLogRecordBuilder
 	// WithLogDatum adds LogDatum (property field)
 	WithLogDatum(BACnetEventLogRecordLogDatum) BACnetEventLogRecordBuilder
-	// WithLogDatumBuilder adds LogDatum (property field) which is build by the builder
-	WithLogDatumBuilder(func(BACnetEventLogRecordLogDatumBuilder) BACnetEventLogRecordLogDatumBuilder) BACnetEventLogRecordBuilder
 	// Build builds the BACnetEventLogRecord or returns an error if something is wrong
 	Build() (BACnetEventLogRecord, error)
 	// MustBuild does the same as Build but panics on error
@@ -130,19 +130,6 @@ func (m *_BACnetEventLogRecordBuilder) WithLogDatum(logDatum BACnetEventLogRecor
 	return m
 }
 
-func (m *_BACnetEventLogRecordBuilder) WithLogDatumBuilder(builderSupplier func(BACnetEventLogRecordLogDatumBuilder) BACnetEventLogRecordLogDatumBuilder) BACnetEventLogRecordBuilder {
-	builder := builderSupplier(m.LogDatum.CreateBACnetEventLogRecordLogDatumBuilder())
-	var err error
-	m.LogDatum, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetEventLogRecordLogDatumBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetEventLogRecordBuilder) Build() (BACnetEventLogRecord, error) {
 	if m.Timestamp == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
index 30207b918ea..ec278fa2668 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
index 613f33bbb79..37429b5731b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumLogStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
index 1a093228099..67c216b371a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
index d48ef21acd5..6489fe83723 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatumTimeChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
index 732070b0310..e95b681dd21 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventNotificationSubscription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
index 29da3371e1d..ba636e23c03 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEvent.go
index 9a480b3047d..a00fd396097 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
index 274d8169b02..920a273475f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterAccessEventListOfAccessEvents.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterBufferReady.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterBufferReady.go
index f320e9b8d34..80e3c19e581 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterBufferReady.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterBufferReady.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstring.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstring.go
index 42c1f9a5877..e82fea664b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstring.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstring.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
index d8f25f0ed07..9e6d6850234 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfBitstringListOfBitstringValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterString.go
index 5f46441a1f9..c25137db3f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
index d2678047f38..f043afa4238 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfCharacterStringListOfAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfDiscreteValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfDiscreteValue.go
index 6a8d2e16459..fcb6b5d189c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfDiscreteValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfDiscreteValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavety.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavety.go
index f3d80141ddd..2b99792a7e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavety.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavety.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
index ecbd37f34ac..e82eae8eea5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
index d88eaafa16d..e876315a929 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfLifeSavetyListOfLifeSavetyAlarmValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfState.go
index 9d261ad34b7..e036832f4b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
index 09aea3c54fb..1f2c43c7d22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStateListOfValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStatusFlags.go
index 942cbbfcae1..e74a4fd6c32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimer.go
index bb9b8c5e54e..07b077d05c7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
index 63f507241f5..499ab0b6b00 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfTimerAlarmValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValue.go
index d812283a543..483a825ae89 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -109,8 +111,6 @@ type BACnetEventParameterChangeOfValueBuilder interface {
 	WithTimeDelayBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetEventParameterChangeOfValueBuilder
 	// WithCovCriteria adds CovCriteria (property field)
 	WithCovCriteria(BACnetEventParameterChangeOfValueCivCriteria) BACnetEventParameterChangeOfValueBuilder
-	// WithCovCriteriaBuilder adds CovCriteria (property field) which is build by the builder
-	WithCovCriteriaBuilder(func(BACnetEventParameterChangeOfValueCivCriteriaBuilder) BACnetEventParameterChangeOfValueCivCriteriaBuilder) BACnetEventParameterChangeOfValueBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetEventParameterChangeOfValueBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -179,19 +179,6 @@ func (m *_BACnetEventParameterChangeOfValueBuilder) WithCovCriteria(covCriteria
 	return m
 }
 
-func (m *_BACnetEventParameterChangeOfValueBuilder) WithCovCriteriaBuilder(builderSupplier func(BACnetEventParameterChangeOfValueCivCriteriaBuilder) BACnetEventParameterChangeOfValueCivCriteriaBuilder) BACnetEventParameterChangeOfValueBuilder {
-	builder := builderSupplier(m.CovCriteria.CreateBACnetEventParameterChangeOfValueCivCriteriaBuilder())
-	var err error
-	m.CovCriteria, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetEventParameterChangeOfValueCivCriteriaBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetEventParameterChangeOfValueBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetEventParameterChangeOfValueBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
index 82dbbf8e843..a34526c2147 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
index 7eaade267d8..df89a35e7c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaBitmask.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
index ede43986983..b6f36dab454 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteriaReferencedPropertyIncrement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterCommandFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterCommandFailure.go
index 6599cabc7e1..0c0ecd14f80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterCommandFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterCommandFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterDoubleOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterDoubleOutOfRange.go
index 1b8e5f97334..2afb4444c7a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterDoubleOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterDoubleOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtended.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtended.go
index c01b679c07c..3e396e1cd35 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtended.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
index 1a3e0af55f2..737aeab5314 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterFloatingLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterFloatingLimit.go
index 29156da6ab4..f0479f27d30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterFloatingLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterFloatingLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterNone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterNone.go
index eba5cb296d4..c3258d23591 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterNone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterNone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterOutOfRange.go
index eecb057dd33..c2b51c504e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterSignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterSignedOutOfRange.go
index a927873e929..f1a9c6fdf0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterSignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterSignedOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedOutOfRange.go
index d848d0996db..ce2d47612d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedRange.go
index a2807feae23..dcec6392294 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterUnsignedRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
index 1c0652345dc..d48cd334824 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventPriorities.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
index 755d71b68f0..6f977604f67 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
index 88a8884fe86..ee26995ddc1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
index b9ffb84168d..c23c6547233 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummariesList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
index 7924cb7b0f7..4b28e9c4aed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
index 9c280fcba3b..1059d8642d1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestamps.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -84,16 +86,10 @@ type BACnetEventTimestampsBuilder interface {
 	WithMandatoryFields(toOffnormal BACnetTimeStamp, toFault BACnetTimeStamp, toNormal BACnetTimeStamp) BACnetEventTimestampsBuilder
 	// WithToOffnormal adds ToOffnormal (property field)
 	WithToOffnormal(BACnetTimeStamp) BACnetEventTimestampsBuilder
-	// WithToOffnormalBuilder adds ToOffnormal (property field) which is build by the builder
-	WithToOffnormalBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder
 	// WithToFault adds ToFault (property field)
 	WithToFault(BACnetTimeStamp) BACnetEventTimestampsBuilder
-	// WithToFaultBuilder adds ToFault (property field) which is build by the builder
-	WithToFaultBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder
 	// WithToNormal adds ToNormal (property field)
 	WithToNormal(BACnetTimeStamp) BACnetEventTimestampsBuilder
-	// WithToNormalBuilder adds ToNormal (property field) which is build by the builder
-	WithToNormalBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder
 	// Build builds the BACnetEventTimestamps or returns an error if something is wrong
 	Build() (BACnetEventTimestamps, error)
 	// MustBuild does the same as Build but panics on error
@@ -122,55 +118,16 @@ func (m *_BACnetEventTimestampsBuilder) WithToOffnormal(toOffnormal BACnetTimeSt
 	return m
 }
 
-func (m *_BACnetEventTimestampsBuilder) WithToOffnormalBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder {
-	builder := builderSupplier(m.ToOffnormal.CreateBACnetTimeStampBuilder())
-	var err error
-	m.ToOffnormal, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetEventTimestampsBuilder) WithToFault(toFault BACnetTimeStamp) BACnetEventTimestampsBuilder {
 	m.ToFault = toFault
 	return m
 }
 
-func (m *_BACnetEventTimestampsBuilder) WithToFaultBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder {
-	builder := builderSupplier(m.ToFault.CreateBACnetTimeStampBuilder())
-	var err error
-	m.ToFault, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetEventTimestampsBuilder) WithToNormal(toNormal BACnetTimeStamp) BACnetEventTimestampsBuilder {
 	m.ToNormal = toNormal
 	return m
 }
 
-func (m *_BACnetEventTimestampsBuilder) WithToNormalBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetEventTimestampsBuilder {
-	builder := builderSupplier(m.ToNormal.CreateBACnetTimeStampBuilder())
-	var err error
-	m.ToNormal, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetEventTimestampsBuilder) Build() (BACnetEventTimestamps, error) {
 	if m.ToOffnormal == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
index 712bb9312b2..959a73ddd7a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTimestampsEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
index 10e08507e62..67cbe950f22 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
index 03edbb26f02..e149bda5ebd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTransitionBitsTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
index dc00bee8d6c..331f74304b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
index 80782651f8a..7de81e5d208 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
index 3d1a01bcf96..a3b09ab20c0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterString.go
index 77a2026ed9b..22d590e9fe7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
index 6bc90f97cc9..17c1dc39df7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultCharacterStringListOfFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtended.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtended.go
index 0ec639f5b89..d591ae7f320 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtended.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
index 13c057d1cd7..175bc4062b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
index 783d1397438..4975844b079 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBitString.go
index f68b4a9fd05..0c601c71ca7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBoolean.go
index d920a41c337..c26b49cc585 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryCharacterString.go
index 8f6e045fdc1..fa47d2b2152 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDate.go
index 2d61263ba69..13df9c6d879 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDouble.go
index ac145834e7c..84e889aaa79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryEnumerated.go
index 77b0b8484eb..aabf60988ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryInteger.go
index 40007a6e43f..a5dd06e681e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryNull.go
index 87935798c08..633008d1073 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryObjectidentifier.go
index b02568a0ecd..d0546b42c23 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryObjectidentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryOctetString.go
index 818d6c3a194..98aef7572df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReal.go
index 028b7700a0e..87b499dcae9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReference.go
index 6a0cf504bd1..394b71179da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryTime.go
index db5c681a653..42bcfc1c11e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryUnsigned.go
index eaab2f3f2f1..1c2ba882c45 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntryUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafety.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafety.go
index b8b4ab0a8af..eae22999670 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafety.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafety.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
index 1f42b0ce62a..1258c84cbf7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultLifeSafetyListOfFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultListed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultListed.go
index 16d526149f3..47aaee5a5d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultListed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultListed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRange.go
index 36cffb617b0..5c69c8baca8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -105,12 +107,8 @@ type BACnetFaultParameterFaultOutOfRangeBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetFaultParameterFaultOutOfRangeBuilder
 	// WithMinNormalValue adds MinNormalValue (property field)
 	WithMinNormalValue(BACnetFaultParameterFaultOutOfRangeMinNormalValue) BACnetFaultParameterFaultOutOfRangeBuilder
-	// WithMinNormalValueBuilder adds MinNormalValue (property field) which is build by the builder
-	WithMinNormalValueBuilder(func(BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeBuilder
 	// WithMaxNormalValue adds MaxNormalValue (property field)
 	WithMaxNormalValue(BACnetFaultParameterFaultOutOfRangeMaxNormalValue) BACnetFaultParameterFaultOutOfRangeBuilder
-	// WithMaxNormalValueBuilder adds MaxNormalValue (property field) which is build by the builder
-	WithMaxNormalValueBuilder(func(BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetFaultParameterFaultOutOfRangeBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -161,37 +159,11 @@ func (m *_BACnetFaultParameterFaultOutOfRangeBuilder) WithMinNormalValue(minNorm
 	return m
 }
 
-func (m *_BACnetFaultParameterFaultOutOfRangeBuilder) WithMinNormalValueBuilder(builderSupplier func(BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeBuilder {
-	builder := builderSupplier(m.MinNormalValue.CreateBACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder())
-	var err error
-	m.MinNormalValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetFaultParameterFaultOutOfRangeMinNormalValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetFaultParameterFaultOutOfRangeBuilder) WithMaxNormalValue(maxNormalValue BACnetFaultParameterFaultOutOfRangeMaxNormalValue) BACnetFaultParameterFaultOutOfRangeBuilder {
 	m.MaxNormalValue = maxNormalValue
 	return m
 }
 
-func (m *_BACnetFaultParameterFaultOutOfRangeBuilder) WithMaxNormalValueBuilder(builderSupplier func(BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder) BACnetFaultParameterFaultOutOfRangeBuilder {
-	builder := builderSupplier(m.MaxNormalValue.CreateBACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder())
-	var err error
-	m.MaxNormalValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetFaultParameterFaultOutOfRangeMaxNormalValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetFaultParameterFaultOutOfRangeBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetFaultParameterFaultOutOfRangeBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
index 4fda1521eea..165c9048824 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
index 600c81bc25c..75f404a56f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
index 2925e6c8ffe..514491cdb88 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
index 115f6106d12..fe9a4c09163 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
index 70c45451865..f3732146e15 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
index d22da24ae3e..d9550d176dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
index 9e15c0ce642..33779392659 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
index 4f0a66bf7bf..ac739c23e85 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
index a58f3d0cdd7..049330e9422 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
index e3605037ac7..66cda4cd585 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultState.go
index 7277c25873d..56d4166e5c4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
index 675e54298b9..abe2c9f2451 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStateListOfFaultValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStatusFlags.go
index bcefd63cf55..9b5c4c13fc4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterNone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterNone.go
index 967e8382b33..25044e5b38a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterNone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterNone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
index 17881fb3718..568d6f9b9f1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
index 730a5dd456b..e10b96d4569 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
index 34b76bd077f..feac97e7819 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethod.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
index 86fb0ea116f..9759b7f46b8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFileAccessMethodTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
index 7995b993754..3373bf4b71c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -89,8 +91,6 @@ type BACnetGroupChannelValueBuilder interface {
 	WithOptionalOverridingPriorityBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetGroupChannelValueBuilder
 	// WithValue adds Value (property field)
 	WithValue(BACnetChannelValue) BACnetGroupChannelValueBuilder
-	// WithValueBuilder adds Value (property field) which is build by the builder
-	WithValueBuilder(func(BACnetChannelValueBuilder) BACnetChannelValueBuilder) BACnetGroupChannelValueBuilder
 	// Build builds the BACnetGroupChannelValue or returns an error if something is wrong
 	Build() (BACnetGroupChannelValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -155,19 +155,6 @@ func (m *_BACnetGroupChannelValueBuilder) WithValue(value BACnetChannelValue) BA
 	return m
 }
 
-func (m *_BACnetGroupChannelValueBuilder) WithValueBuilder(builderSupplier func(BACnetChannelValueBuilder) BACnetChannelValueBuilder) BACnetGroupChannelValueBuilder {
-	builder := builderSupplier(m.Value.CreateBACnetChannelValueBuilder())
-	var err error
-	m.Value, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetChannelValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetGroupChannelValueBuilder) Build() (BACnetGroupChannelValue, error) {
 	if m.Channel == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
index 805670b348b..84351275a75 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetGroupChannelValueList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
index 367caddfce1..6739e9b3ce3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
index b9195c9cd6c..cd837827720 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetHostAddressEnclosedBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetHostAddressEnclosedBuilder
 	// WithHostAddress adds HostAddress (property field)
 	WithHostAddress(BACnetHostAddress) BACnetHostAddressEnclosedBuilder
-	// WithHostAddressBuilder adds HostAddress (property field) which is build by the builder
-	WithHostAddressBuilder(func(BACnetHostAddressBuilder) BACnetHostAddressBuilder) BACnetHostAddressEnclosedBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetHostAddressEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -143,19 +143,6 @@ func (m *_BACnetHostAddressEnclosedBuilder) WithHostAddress(hostAddress BACnetHo
 	return m
 }
 
-func (m *_BACnetHostAddressEnclosedBuilder) WithHostAddressBuilder(builderSupplier func(BACnetHostAddressBuilder) BACnetHostAddressBuilder) BACnetHostAddressEnclosedBuilder {
-	builder := builderSupplier(m.HostAddress.CreateBACnetHostAddressBuilder())
-	var err error
-	m.HostAddress, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetHostAddressBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetHostAddressEnclosedBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetHostAddressEnclosedBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressIpAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressIpAddress.go
index 9b5f5740c31..10675e67b53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressIpAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressIpAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressName.go
index 62091b73994..3104206b825 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressNull.go
index e772ca01db2..f65c5f24d89 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddressNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
index 59470a97ffe..1cf44f49445 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
index 07002430559..f583da13976 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostNPortEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
index 4107f2c9dd3..d011417625f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
index f5b9b1ab577..eff9f26e2c2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetIPModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
index 4b269650429..249f6d40a7d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetKeyIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
index 11c46358555..932d06601a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -85,8 +87,6 @@ type BACnetLandingCallStatusBuilder interface {
 	WithFloorNumberBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetLandingCallStatusBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(BACnetLandingCallStatusCommand) BACnetLandingCallStatusBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(BACnetLandingCallStatusCommandBuilder) BACnetLandingCallStatusCommandBuilder) BACnetLandingCallStatusBuilder
 	// WithFloorText adds FloorText (property field)
 	WithOptionalFloorText(BACnetContextTagCharacterString) BACnetLandingCallStatusBuilder
 	// WithOptionalFloorTextBuilder adds FloorText (property field) which is build by the builder
@@ -137,19 +137,6 @@ func (m *_BACnetLandingCallStatusBuilder) WithCommand(command BACnetLandingCallS
 	return m
 }
 
-func (m *_BACnetLandingCallStatusBuilder) WithCommandBuilder(builderSupplier func(BACnetLandingCallStatusCommandBuilder) BACnetLandingCallStatusCommandBuilder) BACnetLandingCallStatusBuilder {
-	builder := builderSupplier(m.Command.CreateBACnetLandingCallStatusCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetLandingCallStatusCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetLandingCallStatusBuilder) WithOptionalFloorText(floorText BACnetContextTagCharacterString) BACnetLandingCallStatusBuilder {
 	m.FloorText = floorText
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
index 517f7b7d82d..c1530361f85 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDestination.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDestination.go
index 0ee6b10d5e9..933b16117b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDestination.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDestination.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDirection.go
index 7c21b0b3ad3..5b197b7fad6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommandDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
index efaabc42b6c..63785577e72 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
index 00974bde883..19bf59bde26 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
index 83c80bb9445..ff1faaa4797 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingDoorStatusLandingDoorsListEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
index 33c6d43c7c9..9406124a561 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
index 627280ae6d1..7cd97a448fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
index 068a3990bd6..b82d1b262fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
index 670e7804d51..f629fef809c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyOperationTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
index 583d6c00273..e69d08f19b8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
index 7cd89e327b8..c6a46f65e7c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLifeSafetyStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
index 3a14b4c705f..0748938b516 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
index d7e5d9ef4c9..44e3ddbbcd1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarCallListFloorList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
index 435676f79a6..d16d8d356eb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirection.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
index b73cb077b30..45df30141a2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDirectionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
index 9b5ec8deb1f..ebab8b52f1e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommand.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
index e0472ba9e88..443a1b90627 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDoorCommandTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
index 132a770dbfa..cdaad1ea69b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
index 288690ab3d6..3b3038add17 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarDriveStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
index 6c065cdd624..20dad2ccd28 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
index 946fa59b717..2a126214985 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftCarModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
index ba118af254e..c62b2d5a37d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFault.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
index 3ab07bbed73..960f1234509 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftFaultTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
index f5457e2e4f8..0525928a11d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
index 97df3640466..9fc5aae5ee5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLiftGroupModeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
index cc154d72da9..da10d3b30f0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
index f43b248d9ed..e70de61c296 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingCommandEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
index 9539dff56d3..0bfd9470e1b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgress.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
index 6fcd0ac8921..422ed0d40a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingInProgressTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
index cb6f68f6d97..4e5377d0445 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
index 85d0210398d..113d2fac094 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingOperationTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
index 8d005eac7b8..f6d131c1dde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransition.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
index b9cbcca7bfe..506d53796f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLightingTransitionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
index c77670b45a7..4aee34bc147 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
index 007485d5bd7..9eb850decfb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLimitEnableTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
index 6bfccf3b136..6fb4823e0b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
index dc3c49854af..bb9ec4c29ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLockStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
index 34673e1b0ce..03f891509c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
index acd0f7bb453..5ae109b7749 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
index dffc357c733..96e53b65903 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
index 22028467fde..46d035aeba3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryAnyValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -77,8 +79,6 @@ type BACnetLogDataLogDataEntryAnyValueBuilder interface {
 	WithMandatoryFields() BACnetLogDataLogDataEntryAnyValueBuilder
 	// WithAnyValue adds AnyValue (property field)
 	WithOptionalAnyValue(BACnetConstructedData) BACnetLogDataLogDataEntryAnyValueBuilder
-	// WithOptionalAnyValueBuilder adds AnyValue (property field) which is build by the builder
-	WithOptionalAnyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetLogDataLogDataEntryAnyValueBuilder
 	// Build builds the BACnetLogDataLogDataEntryAnyValue or returns an error if something is wrong
 	Build() (BACnetLogDataLogDataEntryAnyValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -107,19 +107,6 @@ func (m *_BACnetLogDataLogDataEntryAnyValueBuilder) WithOptionalAnyValue(anyValu
 	return m
 }
 
-func (m *_BACnetLogDataLogDataEntryAnyValueBuilder) WithOptionalAnyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetLogDataLogDataEntryAnyValueBuilder {
-	builder := builderSupplier(m.AnyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.AnyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetLogDataLogDataEntryAnyValueBuilder) Build() (BACnetLogDataLogDataEntryAnyValue, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBitStringValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBitStringValue.go
index a7bf01d606b..f06b71d519a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBitStringValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBitStringValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBooleanValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBooleanValue.go
index 275ec831401..35fc33a5764 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBooleanValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryBooleanValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryEnumeratedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryEnumeratedValue.go
index c730e78324d..a9f5ba08919 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryEnumeratedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryEnumeratedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryFailure.go
index c4a5e239d6c..3da59ce0e79 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryIntegerValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryIntegerValue.go
index e0577411c0f..d85ceac3da7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryIntegerValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryIntegerValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryNullValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryNullValue.go
index fa4e79e789c..955c3e39cb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryNullValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryNullValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryRealValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryRealValue.go
index b4aff25886e..55ab4492911 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryRealValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryRealValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryUnsignedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryUnsignedValue.go
index a19de72d9db..edaae77dfa9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryUnsignedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntryUnsignedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
index e2c5b8d63ce..84f58ceaa61 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataTimeChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
index 6bc965375d2..1209e320129 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
index 623fdfd050d..4e598b3e3c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogMultipleRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type BACnetLogMultipleRecordBuilder interface {
 	WithTimestampBuilder(func(BACnetDateTimeEnclosedBuilder) BACnetDateTimeEnclosedBuilder) BACnetLogMultipleRecordBuilder
 	// WithLogData adds LogData (property field)
 	WithLogData(BACnetLogData) BACnetLogMultipleRecordBuilder
-	// WithLogDataBuilder adds LogData (property field) which is build by the builder
-	WithLogDataBuilder(func(BACnetLogDataBuilder) BACnetLogDataBuilder) BACnetLogMultipleRecordBuilder
 	// Build builds the BACnetLogMultipleRecord or returns an error if something is wrong
 	Build() (BACnetLogMultipleRecord, error)
 	// MustBuild does the same as Build but panics on error
@@ -130,19 +130,6 @@ func (m *_BACnetLogMultipleRecordBuilder) WithLogData(logData BACnetLogData) BAC
 	return m
 }
 
-func (m *_BACnetLogMultipleRecordBuilder) WithLogDataBuilder(builderSupplier func(BACnetLogDataBuilder) BACnetLogDataBuilder) BACnetLogMultipleRecordBuilder {
-	builder := builderSupplier(m.LogData.CreateBACnetLogDataBuilder())
-	var err error
-	m.LogData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetLogDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetLogMultipleRecordBuilder) Build() (BACnetLogMultipleRecord, error) {
 	if m.Timestamp == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
index 972c0ddb571..541ab26a98a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -85,8 +87,6 @@ type BACnetLogRecordBuilder interface {
 	WithTimestampBuilder(func(BACnetDateTimeEnclosedBuilder) BACnetDateTimeEnclosedBuilder) BACnetLogRecordBuilder
 	// WithLogDatum adds LogDatum (property field)
 	WithLogDatum(BACnetLogRecordLogDatum) BACnetLogRecordBuilder
-	// WithLogDatumBuilder adds LogDatum (property field) which is build by the builder
-	WithLogDatumBuilder(func(BACnetLogRecordLogDatumBuilder) BACnetLogRecordLogDatumBuilder) BACnetLogRecordBuilder
 	// WithStatusFlags adds StatusFlags (property field)
 	WithOptionalStatusFlags(BACnetStatusFlagsTagged) BACnetLogRecordBuilder
 	// WithOptionalStatusFlagsBuilder adds StatusFlags (property field) which is build by the builder
@@ -137,19 +137,6 @@ func (m *_BACnetLogRecordBuilder) WithLogDatum(logDatum BACnetLogRecordLogDatum)
 	return m
 }
 
-func (m *_BACnetLogRecordBuilder) WithLogDatumBuilder(builderSupplier func(BACnetLogRecordLogDatumBuilder) BACnetLogRecordLogDatumBuilder) BACnetLogRecordBuilder {
-	builder := builderSupplier(m.LogDatum.CreateBACnetLogRecordLogDatumBuilder())
-	var err error
-	m.LogDatum, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetLogRecordLogDatumBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetLogRecordBuilder) WithOptionalStatusFlags(statusFlags BACnetStatusFlagsTagged) BACnetLogRecordBuilder {
 	m.StatusFlags = statusFlags
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
index 54b661811f0..6f10e13672b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
index 3f8fc6e98ed..58a8a6721f3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumAnyValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -77,8 +79,6 @@ type BACnetLogRecordLogDatumAnyValueBuilder interface {
 	WithMandatoryFields() BACnetLogRecordLogDatumAnyValueBuilder
 	// WithAnyValue adds AnyValue (property field)
 	WithOptionalAnyValue(BACnetConstructedData) BACnetLogRecordLogDatumAnyValueBuilder
-	// WithOptionalAnyValueBuilder adds AnyValue (property field) which is build by the builder
-	WithOptionalAnyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetLogRecordLogDatumAnyValueBuilder
 	// Build builds the BACnetLogRecordLogDatumAnyValue or returns an error if something is wrong
 	Build() (BACnetLogRecordLogDatumAnyValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -107,19 +107,6 @@ func (m *_BACnetLogRecordLogDatumAnyValueBuilder) WithOptionalAnyValue(anyValue
 	return m
 }
 
-func (m *_BACnetLogRecordLogDatumAnyValueBuilder) WithOptionalAnyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetLogRecordLogDatumAnyValueBuilder {
-	builder := builderSupplier(m.AnyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.AnyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetLogRecordLogDatumAnyValueBuilder) Build() (BACnetLogRecordLogDatumAnyValue, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
index f953fb396af..b58a8c4ac34 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBitStringValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
index 626e087eed8..ba5d7eab53e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumBooleanValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
index b523171fede..91688774ae2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumEnumeratedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
index b7e6d05eedd..6d472e918e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
index d2dda1129a9..c10af413525 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumIntegerValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
index eb3f017f658..4b07c509680 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumLogStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
index 28b4286e900..f22af7bdaa7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumNullValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
index c39931eb320..bb9f6a5ef9b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumRealValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
index b01f27a2795..5ce7b14c063 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumTimeChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
index c51761f509c..4d654305f8b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatumUnsignedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
index 87ee7b385e4..572ad219c0c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
index 4a133783573..72a80b54052 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
index 0dee344f600..c5bffb2cc3a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
index e9429bc056a..a36bae8f8cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLoggingTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
index 053c08227b1..8ed985567b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenance.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
index 52b894f5c71..5fe2b0b5dbe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetMaintenanceTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
index 6bb49dfae66..3458cbceef5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -79,8 +81,6 @@ type BACnetNameValueBuilder interface {
 	WithNameBuilder(func(BACnetContextTagCharacterStringBuilder) BACnetContextTagCharacterStringBuilder) BACnetNameValueBuilder
 	// WithValue adds Value (property field)
 	WithOptionalValue(BACnetConstructedData) BACnetNameValueBuilder
-	// WithOptionalValueBuilder adds Value (property field) which is build by the builder
-	WithOptionalValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNameValueBuilder
 	// Build builds the BACnetNameValue or returns an error if something is wrong
 	Build() (BACnetNameValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -127,19 +127,6 @@ func (m *_BACnetNameValueBuilder) WithOptionalValue(value BACnetConstructedData)
 	return m
 }
 
-func (m *_BACnetNameValueBuilder) WithOptionalValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNameValueBuilder {
-	builder := builderSupplier(m.Value.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.Value, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNameValueBuilder) Build() (BACnetNameValue, error) {
 	if m.Name == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
index be506068156..bd6a853f58a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNameValueCollection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
index a94f6bfb36d..377218e9062 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQuality.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
index bf316387b89..ebb9bc7d245 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkNumberQualityTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
index 9e63adfa632..7cd4fa26899 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommand.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
index ca3e3785017..64aa7760276 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkPortCommandTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
index 5dccc1cd20c..23be6d58594 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkSecurityPolicy.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
index 321291a3472..f85060994d5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
index 926d4d36db2..de7c06a098e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNetworkTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
index b1273a55150..881c22f3c4a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
index 9d1c4e8ba42..0bb0ef2810d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNodeTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
index 4b0598e0672..5feca4e081d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
index 363b3b33b3d..680ec09d19a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersAccessEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
index 2fe9287e470..eb186271ced 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
index 6c215452144..d2b3dd54cd1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
index 2d9b1882fc7..3059c889368 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
index 9542106f7bf..e8f1d9d87f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -105,8 +107,6 @@ type BACnetNotificationParametersChangeOfDiscreteValueBuilder interface {
 	WithInnerOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetNotificationParametersChangeOfDiscreteValueBuilder
 	// WithNewValue adds NewValue (property field)
 	WithNewValue(BACnetNotificationParametersChangeOfDiscreteValueNewValue) BACnetNotificationParametersChangeOfDiscreteValueBuilder
-	// WithNewValueBuilder adds NewValue (property field) which is build by the builder
-	WithNewValueBuilder(func(BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) BACnetNotificationParametersChangeOfDiscreteValueBuilder
 	// WithStatusFlags adds StatusFlags (property field)
 	WithStatusFlags(BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfDiscreteValueBuilder
 	// WithStatusFlagsBuilder adds StatusFlags (property field) which is build by the builder
@@ -161,19 +161,6 @@ func (m *_BACnetNotificationParametersChangeOfDiscreteValueBuilder) WithNewValue
 	return m
 }
 
-func (m *_BACnetNotificationParametersChangeOfDiscreteValueBuilder) WithNewValueBuilder(builderSupplier func(BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder) BACnetNotificationParametersChangeOfDiscreteValueBuilder {
-	builder := builderSupplier(m.NewValue.CreateBACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder())
-	var err error
-	m.NewValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetNotificationParametersChangeOfDiscreteValueNewValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNotificationParametersChangeOfDiscreteValueBuilder) WithStatusFlags(statusFlags BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfDiscreteValueBuilder {
 	m.StatusFlags = statusFlags
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
index 2be1e6763cc..52cea0ddc83 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
index 9ebbf670345..8fff27bee3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
index e13121bbc5b..abe7778721b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
index 332edcc1172..0dd88b85335 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueDatetime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
index a80e4241819..78ec141a585 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
index 187f5802558..5a62239f635 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
index 3f6692614c1..e80d31627df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueObjectidentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
index e82e8fcfb6b..8827a656f13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
index e7b2fb7c8c6..4f940494901 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
index 74b9afc1d16..6c8fb079136 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueOctetTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
index 3971a820cc7..e63954eb9e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
index ea2331c343f..49ea8ae9e6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfLifeSafety.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
index 0fa27883988..7a8d38589fe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfReliability.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
index 7b282387cd9..73ef7bd8669 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
index cba511ad8a0..222fc6c23a0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -105,8 +107,6 @@ type BACnetNotificationParametersChangeOfStatusFlagsBuilder interface {
 	WithInnerOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetNotificationParametersChangeOfStatusFlagsBuilder
 	// WithPresentValue adds PresentValue (property field)
 	WithPresentValue(BACnetConstructedData) BACnetNotificationParametersChangeOfStatusFlagsBuilder
-	// WithPresentValueBuilder adds PresentValue (property field) which is build by the builder
-	WithPresentValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersChangeOfStatusFlagsBuilder
 	// WithReferencedFlags adds ReferencedFlags (property field)
 	WithReferencedFlags(BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfStatusFlagsBuilder
 	// WithReferencedFlagsBuilder adds ReferencedFlags (property field) which is build by the builder
@@ -161,19 +161,6 @@ func (m *_BACnetNotificationParametersChangeOfStatusFlagsBuilder) WithPresentVal
 	return m
 }
 
-func (m *_BACnetNotificationParametersChangeOfStatusFlagsBuilder) WithPresentValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersChangeOfStatusFlagsBuilder {
-	builder := builderSupplier(m.PresentValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PresentValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNotificationParametersChangeOfStatusFlagsBuilder) WithReferencedFlags(referencedFlags BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfStatusFlagsBuilder {
 	m.ReferencedFlags = referencedFlags
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
index d878d8ed8fe..654dc48e119 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfTimer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
index 81faca340a9..f3ee603ed08 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -105,8 +107,6 @@ type BACnetNotificationParametersChangeOfValueBuilder interface {
 	WithInnerOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetNotificationParametersChangeOfValueBuilder
 	// WithNewValue adds NewValue (property field)
 	WithNewValue(BACnetNotificationParametersChangeOfValueNewValue) BACnetNotificationParametersChangeOfValueBuilder
-	// WithNewValueBuilder adds NewValue (property field) which is build by the builder
-	WithNewValueBuilder(func(BACnetNotificationParametersChangeOfValueNewValueBuilder) BACnetNotificationParametersChangeOfValueNewValueBuilder) BACnetNotificationParametersChangeOfValueBuilder
 	// WithStatusFlags adds StatusFlags (property field)
 	WithStatusFlags(BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfValueBuilder
 	// WithStatusFlagsBuilder adds StatusFlags (property field) which is build by the builder
@@ -161,19 +161,6 @@ func (m *_BACnetNotificationParametersChangeOfValueBuilder) WithNewValue(newValu
 	return m
 }
 
-func (m *_BACnetNotificationParametersChangeOfValueBuilder) WithNewValueBuilder(builderSupplier func(BACnetNotificationParametersChangeOfValueNewValueBuilder) BACnetNotificationParametersChangeOfValueNewValueBuilder) BACnetNotificationParametersChangeOfValueBuilder {
-	builder := builderSupplier(m.NewValue.CreateBACnetNotificationParametersChangeOfValueNewValueBuilder())
-	var err error
-	m.NewValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetNotificationParametersChangeOfValueNewValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNotificationParametersChangeOfValueBuilder) WithStatusFlags(statusFlags BACnetStatusFlagsTagged) BACnetNotificationParametersChangeOfValueBuilder {
 	m.StatusFlags = statusFlags
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index 53e74ba874e..96b5065e208 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
index 986c4eb95cc..2992039a897 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
index 8f9ed950143..5df28913ebb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
index cf3a74d194a..1dfb8e089f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersCommandFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -112,16 +114,12 @@ type BACnetNotificationParametersCommandFailureBuilder interface {
 	WithInnerOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetNotificationParametersCommandFailureBuilder
 	// WithCommandValue adds CommandValue (property field)
 	WithCommandValue(BACnetConstructedData) BACnetNotificationParametersCommandFailureBuilder
-	// WithCommandValueBuilder adds CommandValue (property field) which is build by the builder
-	WithCommandValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersCommandFailureBuilder
 	// WithStatusFlags adds StatusFlags (property field)
 	WithStatusFlags(BACnetStatusFlagsTagged) BACnetNotificationParametersCommandFailureBuilder
 	// WithStatusFlagsBuilder adds StatusFlags (property field) which is build by the builder
 	WithStatusFlagsBuilder(func(BACnetStatusFlagsTaggedBuilder) BACnetStatusFlagsTaggedBuilder) BACnetNotificationParametersCommandFailureBuilder
 	// WithFeedbackValue adds FeedbackValue (property field)
 	WithFeedbackValue(BACnetConstructedData) BACnetNotificationParametersCommandFailureBuilder
-	// WithFeedbackValueBuilder adds FeedbackValue (property field) which is build by the builder
-	WithFeedbackValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersCommandFailureBuilder
 	// WithInnerClosingTag adds InnerClosingTag (property field)
 	WithInnerClosingTag(BACnetClosingTag) BACnetNotificationParametersCommandFailureBuilder
 	// WithInnerClosingTagBuilder adds InnerClosingTag (property field) which is build by the builder
@@ -172,19 +170,6 @@ func (m *_BACnetNotificationParametersCommandFailureBuilder) WithCommandValue(co
 	return m
 }
 
-func (m *_BACnetNotificationParametersCommandFailureBuilder) WithCommandValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersCommandFailureBuilder {
-	builder := builderSupplier(m.CommandValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.CommandValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNotificationParametersCommandFailureBuilder) WithStatusFlags(statusFlags BACnetStatusFlagsTagged) BACnetNotificationParametersCommandFailureBuilder {
 	m.StatusFlags = statusFlags
 	return m
@@ -208,19 +193,6 @@ func (m *_BACnetNotificationParametersCommandFailureBuilder) WithFeedbackValue(f
 	return m
 }
 
-func (m *_BACnetNotificationParametersCommandFailureBuilder) WithFeedbackValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetNotificationParametersCommandFailureBuilder {
-	builder := builderSupplier(m.FeedbackValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.FeedbackValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetNotificationParametersCommandFailureBuilder) WithInnerClosingTag(innerClosingTag BACnetClosingTag) BACnetNotificationParametersCommandFailureBuilder {
 	m.InnerClosingTag = innerClosingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
index 5906273897c..41355340a90 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
index 7d6bec93c4e..74936b10e0a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersDoubleOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
index 788d237176d..a38216d2405 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index afd93202872..fceff9efd89 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
index ee67a66d819..3ea4de26e01 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
index 0546193d234..6d6aef52e02 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
index 007727d1344..3c4c65531fc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersSignedOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
index 32b761836ae..d2b6fcb0967 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedOutOfRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
index 283838a7115..a6b2275298c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
index fa885ce61c7..30ee6501a4d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
index 30a3ee90bff..d5c304424d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotifyTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
index 76593fe7a71..286c211cd49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
index c21f3df82d2..ac65ece6066 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectPropertyReferenceEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
index 56294e3504b..07e96e54282 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
index c51c5144765..f2ea0922986 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
index 1353cc094ee..50de98ef6b4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupported.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
index 80569cc66ed..ec38f4fad92 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetObjectTypesSupportedTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
index 09ff4486fe9..9b8044c7cb7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOpeningTag.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
index cfe9bbd1ad2..5c396273a36 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVNull.go
index 75df338cc48..a4eacbf6c85 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVValue.go
index 608911ba06e..394de0d8669 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPVValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
index eca401c81f7..794d1835901 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringNull.go
index 8aa24ced1e3..19cbdfe3b51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringValue.go
index c5a058edddd..cad2cf9333b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterStringValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
index 52a0ecb87e0..96ba186dcf3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALNull.go
index 31973b27331..94f36dcbb9a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALValue.go
index 3f86893f4e9..95307a8272d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREALValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
index c9d1c20cf09..c2122537a3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedNull.go
index 3d90ae70519..d06482dfb63 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedValue.go
index ef13fec86c9..2b35ca47217 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsignedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
index 2ebe06a9311..eacd0cc3225 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarity.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
index 4af42d8a942..f53ad60fb50 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPolarityTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
index c929501f154..e425cb683a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPortPermission.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
index 7d331ce8aa0..97ed694cc9d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPrescale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
index 7529dfc01a1..17c3aea01e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityArray.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
index 3d809a07696..f4356c333a6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
index ec4171d2342..eb413fa9151 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
index 5bf2a4fa3ee..6bc16ef32ba 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
index 7a4dcd2f93f..3808c5f9d6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
index 11aba748008..a154195bdcd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueConstructedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type BACnetPriorityValueConstructedValueBuilder interface {
 	WithMandatoryFields(constructedValue BACnetConstructedData) BACnetPriorityValueConstructedValueBuilder
 	// WithConstructedValue adds ConstructedValue (property field)
 	WithConstructedValue(BACnetConstructedData) BACnetPriorityValueConstructedValueBuilder
-	// WithConstructedValueBuilder adds ConstructedValue (property field) which is build by the builder
-	WithConstructedValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPriorityValueConstructedValueBuilder
 	// Build builds the BACnetPriorityValueConstructedValue or returns an error if something is wrong
 	Build() (BACnetPriorityValueConstructedValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_BACnetPriorityValueConstructedValueBuilder) WithConstructedValue(const
 	return m
 }
 
-func (m *_BACnetPriorityValueConstructedValueBuilder) WithConstructedValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPriorityValueConstructedValueBuilder {
-	builder := builderSupplier(m.ConstructedValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ConstructedValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetPriorityValueConstructedValueBuilder) Build() (BACnetPriorityValueConstructedValue, error) {
 	if m.ConstructedValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
index 94feae48ee4..b8c9a0708ce 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
index a95e36adc23..0251e720c26 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
index 2f47271861c..2c6e6fe77c9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
index f17aac5dcfa..5f9cf1a5afc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
index 49fc07ac7dd..88e4154e24d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
index a16bf93b274..82ff131e806 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
index 9b64c7ea718..e6b2ea16095 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueObjectidentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
index 7af50261ee5..f14036809a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
index 55b4743dbf9..a9b3026b4d7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
index 9ce6d830415..0eb6c3e90aa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
index a6e364fe2a1..ba96a9e3e10 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
index 0b9e1e24fa9..a6c51eb3d5d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionNull.go
index 144ef288b20..9ca30082e0e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionValue.go
index a9f073da502..ec67659449e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelectionValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
index a411cafa222..36264599083 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramError.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
index 0b6d06e1734..8a847379c6b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramErrorTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
index 14ef09cc735..164a213aff0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequest.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
index c8894aa7792..8a86563baa9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramRequestTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
index 3ebf88cf285..0214c3bf9bc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
index bde622f07f1..07e47fb1306 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProgramStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
index aabf5ecc54f..5e6dc0e570e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -106,8 +108,6 @@ type BACnetPropertyAccessResultBuilder interface {
 	WithOptionalDeviceIdentifierBuilder(func(BACnetContextTagObjectIdentifierBuilder) BACnetContextTagObjectIdentifierBuilder) BACnetPropertyAccessResultBuilder
 	// WithAccessResult adds AccessResult (property field)
 	WithAccessResult(BACnetPropertyAccessResultAccessResult) BACnetPropertyAccessResultBuilder
-	// WithAccessResultBuilder adds AccessResult (property field) which is build by the builder
-	WithAccessResultBuilder(func(BACnetPropertyAccessResultAccessResultBuilder) BACnetPropertyAccessResultAccessResultBuilder) BACnetPropertyAccessResultBuilder
 	// Build builds the BACnetPropertyAccessResult or returns an error if something is wrong
 	Build() (BACnetPropertyAccessResult, error)
 	// MustBuild does the same as Build but panics on error
@@ -208,19 +208,6 @@ func (m *_BACnetPropertyAccessResultBuilder) WithAccessResult(accessResult BACne
 	return m
 }
 
-func (m *_BACnetPropertyAccessResultBuilder) WithAccessResultBuilder(builderSupplier func(BACnetPropertyAccessResultAccessResultBuilder) BACnetPropertyAccessResultAccessResultBuilder) BACnetPropertyAccessResultBuilder {
-	builder := builderSupplier(m.AccessResult.CreateBACnetPropertyAccessResultAccessResultBuilder())
-	var err error
-	m.AccessResult, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetPropertyAccessResultAccessResultBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetPropertyAccessResultBuilder) Build() (BACnetPropertyAccessResult, error) {
 	if m.ObjectIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
index a8619ea959a..42f02c121f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
index cb59f99f101..89f758463c6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyAccessError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
index d60ee183d70..c4661eefa53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResultPropertyValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type BACnetPropertyAccessResultAccessResultPropertyValueBuilder interface {
 	WithMandatoryFields(propertyValue BACnetConstructedData) BACnetPropertyAccessResultAccessResultPropertyValueBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithPropertyValue(BACnetConstructedData) BACnetPropertyAccessResultAccessResultPropertyValueBuilder
-	// WithPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPropertyAccessResultAccessResultPropertyValueBuilder
 	// Build builds the BACnetPropertyAccessResultAccessResultPropertyValue or returns an error if something is wrong
 	Build() (BACnetPropertyAccessResultAccessResultPropertyValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_BACnetPropertyAccessResultAccessResultPropertyValueBuilder) WithProper
 	return m
 }
 
-func (m *_BACnetPropertyAccessResultAccessResultPropertyValueBuilder) WithPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPropertyAccessResultAccessResultPropertyValueBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetPropertyAccessResultAccessResultPropertyValueBuilder) Build() (BACnetPropertyAccessResultAccessResultPropertyValue, error) {
 	if m.PropertyValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
index 884a0d9fb77..a9d6615702c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifier.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
index cb0b3e11d28..c057a7c3644 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyIdentifierTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
index fc80cfdcaec..9fbcb9b57f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
index 50e6cc4b15d..32e67fd0240 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyReferenceEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStateActionUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStateActionUnknown.go
index 0d398b870e0..8d33e46343a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStateActionUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStateActionUnknown.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
index 7f9b49598b6..1c1ceed3bb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisable.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisable.go
index 7e6ba2c70de..53a9f26d3df 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisableReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisableReason.go
index 39dc692f8e2..8a37a058011 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisableReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessCredentialDisableReason.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessEvent.go
index eb1a7796697..0ccb483b46d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAccessEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAction.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
index 8eb20737384..3160e1ebc69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAuthenticationStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAuthenticationStatus.go
index d57a41d1140..abb03456b99 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAuthenticationStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesAuthenticationStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBackupState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBackupState.go
index a647e68349b..7b626f680f8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBackupState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBackupState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBacnetIpMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBacnetIpMode.go
index ee86a4671b8..0f0b1ca0d14 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBacnetIpMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBacnetIpMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryLightningValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryLightningValue.go
index 57d9ae9afa6..cda48fc80f3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryLightningValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryLightningValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
index a71daaa7787..af02ef562dd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
index b37a931f9db..c23a02ef379 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorAlarmState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorAlarmState.go
index aa036c3d17c..7ae7a2063a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorAlarmState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorAlarmState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorSecuredStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorSecuredStatus.go
index cb29cc8e567..f7aad251570 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorSecuredStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorSecuredStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorStatus.go
index 059a4c0fcfa..8bdf10c0514 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorValue.go
index 2713eb75aa1..2026c7c706a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesDoorValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
index 8fbe4c9560f..7497319240a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetPropertyStatesEnclosedBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetPropertyStatesEnclosedBuilder
 	// WithPropertyState adds PropertyState (property field)
 	WithPropertyState(BACnetPropertyStates) BACnetPropertyStatesEnclosedBuilder
-	// WithPropertyStateBuilder adds PropertyState (property field) which is build by the builder
-	WithPropertyStateBuilder(func(BACnetPropertyStatesBuilder) BACnetPropertyStatesBuilder) BACnetPropertyStatesEnclosedBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetPropertyStatesEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -143,19 +143,6 @@ func (m *_BACnetPropertyStatesEnclosedBuilder) WithPropertyState(propertyState B
 	return m
 }
 
-func (m *_BACnetPropertyStatesEnclosedBuilder) WithPropertyStateBuilder(builderSupplier func(BACnetPropertyStatesBuilder) BACnetPropertyStatesBuilder) BACnetPropertyStatesEnclosedBuilder {
-	builder := builderSupplier(m.PropertyState.CreateBACnetPropertyStatesBuilder())
-	var err error
-	m.PropertyState, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetPropertyStatesBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetPropertyStatesEnclosedBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetPropertyStatesEnclosedBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorFault.go
index d4999d93dbc..e05dad4b57c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorFault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorMode.go
index 6c13c653ba3..77ed865b1e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorOperationDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorOperationDirection.go
index 7f7ef9738e4..273985c16a3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorOperationDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEscalatorOperationDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEventType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEventType.go
index 70f2618c97e..6af44d67302 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEventType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesEventType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesExtendedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesExtendedValue.go
index e38bc92681a..c0c621bc6ae 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesExtendedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesExtendedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesFileAccessMethod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesFileAccessMethod.go
index ea56804428c..61c37e42055 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesFileAccessMethod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesFileAccessMethod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesIntegerValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesIntegerValue.go
index c46ff537121..e03e35ac39e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesIntegerValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesIntegerValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyMode.go
index 43e5f4dbe6d..0a9b23ad2d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyOperations.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyOperations.go
index e349f7be6d9..fffba0952d0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyOperations.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyOperations.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyState.go
index d1d166c4093..63c2eb97472 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLifeSafetyState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDirection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDirection.go
index 155fd30231e..041f76ba3a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDirection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDirection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDoorCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDoorCommand.go
index 81e0da537c1..be8c9c55446 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDoorCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDoorCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDriveStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDriveStatus.go
index 82f5f374669..11126c31706 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDriveStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarDriveStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarMode.go
index 79db80ebcfd..ebccc374dda 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftCarMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftFault.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftFault.go
index 7287309e538..bfa7a076b6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftFault.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftFault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftGroupMode.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftGroupMode.go
index 6c8192e4f10..d49e3cb5419 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftGroupMode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLiftGroupMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningInProgress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningInProgress.go
index ef89f82f00b..75efde617b1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningInProgress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningInProgress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningOperation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningOperation.go
index ac825ab423c..4c855434526 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningOperation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningOperation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningTransition.go
index 1de595864eb..5fd93a49f17 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLightningTransition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLockStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLockStatus.go
index c03afff8d8b..c88ba0c8981 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLockStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesLockStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesMaintenance.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesMaintenance.go
index b0e533efa3f..eb699ec563c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesMaintenance.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesMaintenance.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkNumberQuality.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkNumberQuality.go
index fa233738616..617043d2376 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkNumberQuality.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkNumberQuality.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkPortCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkPortCommand.go
index 25a2daf9198..105eabb47b6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkPortCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkPortCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkType.go
index e86c547999e..e79fba564f5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNetworkType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNodeType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNodeType.go
index eb68d1d95f9..869840bc1e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNodeType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNodeType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNotifyType.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNotifyType.go
index fedf4813721..a76f7d8edb3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNotifyType.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesNotifyType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesPolarity.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesPolarity.go
index 0b709bc37d1..48396978edc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesPolarity.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesPolarity.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProgramChange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProgramChange.go
index ea9592197d8..f37cd3607d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProgramChange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProgramChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProtocolLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProtocolLevel.go
index e39b8b0f8fd..c188cc77f2e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProtocolLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesProtocolLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReasonForHalt.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReasonForHalt.go
index bc4549889f3..c7291cd4e25 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReasonForHalt.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReasonForHalt.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReliability.go
index 88dba887c44..9a197980f8e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesReliability.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesRestartReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesRestartReason.go
index 75a67ef8d1e..72e000f7025 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesRestartReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesRestartReason.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSecurityLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSecurityLevel.go
index 5d167260e8c..56a32e4e4c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSecurityLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSecurityLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesShedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesShedState.go
index f5a270771f9..8c94e0a94ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesShedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesShedState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSilencedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSilencedState.go
index c5b32eeea44..7af62f6deb1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSilencedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSilencedState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesState.go
index b5f2316a561..69fe7b69745 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSystemStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSystemStatus.go
index 70470d43cd6..e6ed23e1d63 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSystemStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesSystemStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerState.go
index 97f09c80d2f..ac1d99ddcde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerTransition.go
index d0c8f79f2b3..f8eebe22b45 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesTimerTransition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesUnits.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesUnits.go
index 0848af7a5ff..182415ce99b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesUnits.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesWriteStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesWriteStatus.go
index 674214c8501..55d31cbb0f6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesWriteStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesWriteStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesZoneOccupanyState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesZoneOccupanyState.go
index 21d56c1d072..444515b69a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesZoneOccupanyState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStatesZoneOccupanyState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
index 8537761f584..e0b5e003eac 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
index 6961e1485da..7a6709275b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
index 5bbfb5d5758..f4bb3abe600 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyWriteDefinition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type BACnetPropertyWriteDefinitionBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetPropertyWriteDefinitionBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithOptionalPropertyValue(BACnetConstructedData) BACnetPropertyWriteDefinitionBuilder
-	// WithOptionalPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithOptionalPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPropertyWriteDefinitionBuilder
 	// WithPriority adds Priority (property field)
 	WithOptionalPriority(BACnetContextTagUnsignedInteger) BACnetPropertyWriteDefinitionBuilder
 	// WithOptionalPriorityBuilder adds Priority (property field) which is build by the builder
@@ -162,19 +162,6 @@ func (m *_BACnetPropertyWriteDefinitionBuilder) WithOptionalPropertyValue(proper
 	return m
 }
 
-func (m *_BACnetPropertyWriteDefinitionBuilder) WithOptionalPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetPropertyWriteDefinitionBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetPropertyWriteDefinitionBuilder) WithOptionalPriority(priority BACnetContextTagUnsignedInteger) BACnetPropertyWriteDefinitionBuilder {
 	m.Priority = priority
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
index 55cb328bc7f..881264ec412 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
index cb9c91b18cb..f44614ff319 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProtocolLevelTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
index 9b2ffbe2a12..e4a577a7475 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
index ec571ed929c..01743662acc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -89,8 +91,6 @@ type BACnetReadAccessPropertyReadResultBuilder interface {
 	WithPeekedTagHeaderBuilder(func(BACnetTagHeaderBuilder) BACnetTagHeaderBuilder) BACnetReadAccessPropertyReadResultBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithOptionalPropertyValue(BACnetConstructedData) BACnetReadAccessPropertyReadResultBuilder
-	// WithOptionalPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithOptionalPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetReadAccessPropertyReadResultBuilder
 	// WithPropertyAccessError adds PropertyAccessError (property field)
 	WithOptionalPropertyAccessError(ErrorEnclosed) BACnetReadAccessPropertyReadResultBuilder
 	// WithOptionalPropertyAccessErrorBuilder adds PropertyAccessError (property field) which is build by the builder
@@ -141,19 +141,6 @@ func (m *_BACnetReadAccessPropertyReadResultBuilder) WithOptionalPropertyValue(p
 	return m
 }
 
-func (m *_BACnetReadAccessPropertyReadResultBuilder) WithOptionalPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetReadAccessPropertyReadResultBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetReadAccessPropertyReadResultBuilder) WithOptionalPropertyAccessError(propertyAccessError ErrorEnclosed) BACnetReadAccessPropertyReadResultBuilder {
 	m.PropertyAccessError = propertyAccessError
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
index 3208d351237..fe510025657 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
index a756ef77f45..ff825d47f64 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessResultListOfResults.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
index 13cf2b7163d..d94e50cb8dc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
index a509e0403fe..2774a178b3b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientAddress.go
index 168c9a11321..a066db6af80 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientDevice.go
index 08840799e75..d2e62f5737f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientDevice.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
index f09e83d1596..651a44d3fbe 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetRecipientEnclosedBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetRecipientEnclosedBuilder
 	// WithRecipient adds Recipient (property field)
 	WithRecipient(BACnetRecipient) BACnetRecipientEnclosedBuilder
-	// WithRecipientBuilder adds Recipient (property field) which is build by the builder
-	WithRecipientBuilder(func(BACnetRecipientBuilder) BACnetRecipientBuilder) BACnetRecipientEnclosedBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetRecipientEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -143,19 +143,6 @@ func (m *_BACnetRecipientEnclosedBuilder) WithRecipient(recipient BACnetRecipien
 	return m
 }
 
-func (m *_BACnetRecipientEnclosedBuilder) WithRecipientBuilder(builderSupplier func(BACnetRecipientBuilder) BACnetRecipientBuilder) BACnetRecipientEnclosedBuilder {
-	builder := builderSupplier(m.Recipient.CreateBACnetRecipientBuilder())
-	var err error
-	m.Recipient, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetRecipientBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetRecipientEnclosedBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetRecipientEnclosedBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
index 0b58d7f5e12..19c7a57385d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcess.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
index 7bb77233b8d..ed730dcb55d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipientProcessEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
index 07f36e5783b..49dce0b7601 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
index 79d7f611553..b6855e8a489 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRejectReasonTagged.go
@@ -22,10 +22,12 @@ package model
 import (
 	"context"
 	"fmt"
-	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
index 2f628e2c2e5..af68120e916 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationship.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
index 1df38abb626..5d44082b097 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRelationshipTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
index 48cfc2f61d4..a32ddc0ed4f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliability.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
index ae405a85a4c..5ef0ff39a1e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReliabilityTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
index 955d10fa9c9..d2b00bbb67d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
index 626a6f85501..fd9a34c1729 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRestartReasonTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
index 290e99e25a8..3ab559690cf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlags.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
index 220049b9f3f..102ecd1afaf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetResultFlagsTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
index f2afc6bc8c5..67282e723b3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
index c690e0a3381..85670556a96 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
index 3b32e8671c5..87fa12b5053 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRouterEntryStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
index 8d6a48759f1..02003bd3c44 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleFloatScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleFloatScale.go
index 397819fbcc0..e0d79068e9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleFloatScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleFloatScale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleIntegerScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleIntegerScale.go
index 93dbd172553..4546fb40f57 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleIntegerScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetScaleIntegerScale.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
index 87e02d8f36e..2aed27b20f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySet.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
index ac47c6b8275..510c6694703 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityKeySetKeyIds.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
index d9356ecf523..dc6c5d0bb5a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
index e99b33da5b1..d8a1ffc930d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityLevelTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
index 1e731ec8c09..052277b8b49 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicy.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
index 6889f743df5..e91a36242da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSecurityPolicyTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
index 3d553db0ea4..4d7b83eb4b9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
index e31317217c5..c53680d9519 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSegmentationTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
index e44aecde4ef..282485ed5f9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
index c4d7bf7bfbf..2871fd38982 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetServiceAckAtomicReadFileBuilder interface {
 	WithEndOfFileBuilder(func(BACnetApplicationTagBooleanBuilder) BACnetApplicationTagBooleanBuilder) BACnetServiceAckAtomicReadFileBuilder
 	// WithAccessMethod adds AccessMethod (property field)
 	WithAccessMethod(BACnetServiceAckAtomicReadFileStreamOrRecord) BACnetServiceAckAtomicReadFileBuilder
-	// WithAccessMethodBuilder adds AccessMethod (property field) which is build by the builder
-	WithAccessMethodBuilder(func(BACnetServiceAckAtomicReadFileStreamOrRecordBuilder) BACnetServiceAckAtomicReadFileStreamOrRecordBuilder) BACnetServiceAckAtomicReadFileBuilder
 	// Build builds the BACnetServiceAckAtomicReadFile or returns an error if something is wrong
 	Build() (BACnetServiceAckAtomicReadFile, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_BACnetServiceAckAtomicReadFileBuilder) WithAccessMethod(accessMethod B
 	return m
 }
 
-func (m *_BACnetServiceAckAtomicReadFileBuilder) WithAccessMethodBuilder(builderSupplier func(BACnetServiceAckAtomicReadFileStreamOrRecordBuilder) BACnetServiceAckAtomicReadFileStreamOrRecordBuilder) BACnetServiceAckAtomicReadFileBuilder {
-	builder := builderSupplier(m.AccessMethod.CreateBACnetServiceAckAtomicReadFileStreamOrRecordBuilder())
-	var err error
-	m.AccessMethod, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetServiceAckAtomicReadFileStreamOrRecordBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetServiceAckAtomicReadFileBuilder) Build() (BACnetServiceAckAtomicReadFile, error) {
 	if m.EndOfFile == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
index e7f42db462a..5312c211ae2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
index e65b2260a0f..ce828ef2701 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
index 6a98c9a941b..089b86a588d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index b15109b1f0e..5564aeaf597 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
index 3f82c991bb7..db13e46c5db 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAuthenticate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
index 670bdd5b384..6c579629f97 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -99,8 +101,6 @@ type BACnetServiceAckConfirmedPrivateTransferBuilder interface {
 	WithServiceNumberBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetServiceAckConfirmedPrivateTransferBuilder
 	// WithResultBlock adds ResultBlock (property field)
 	WithOptionalResultBlock(BACnetConstructedData) BACnetServiceAckConfirmedPrivateTransferBuilder
-	// WithOptionalResultBlockBuilder adds ResultBlock (property field) which is build by the builder
-	WithOptionalResultBlockBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckConfirmedPrivateTransferBuilder
 	// Build builds the BACnetServiceAckConfirmedPrivateTransfer or returns an error if something is wrong
 	Build() (BACnetServiceAckConfirmedPrivateTransfer, error)
 	// MustBuild does the same as Build but panics on error
@@ -165,19 +165,6 @@ func (m *_BACnetServiceAckConfirmedPrivateTransferBuilder) WithOptionalResultBlo
 	return m
 }
 
-func (m *_BACnetServiceAckConfirmedPrivateTransferBuilder) WithOptionalResultBlockBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckConfirmedPrivateTransferBuilder {
-	builder := builderSupplier(m.ResultBlock.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ResultBlock, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetServiceAckConfirmedPrivateTransferBuilder) Build() (BACnetServiceAckConfirmedPrivateTransfer, error) {
 	if m.VendorId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
index 2c4f4ce30ed..bd5f1c45069 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
index 3fe07bc5d1f..ccd4cff12ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
index 1e367b57b43..d6856314e98 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
index 96e97f33e47..e025b994b3b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index bbf5d50a70e..ad469ceb51d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,8 +109,6 @@ type BACnetServiceAckReadPropertyBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetServiceAckReadPropertyBuilder
 	// WithValues adds Values (property field)
 	WithOptionalValues(BACnetConstructedData) BACnetServiceAckReadPropertyBuilder
-	// WithOptionalValuesBuilder adds Values (property field) which is build by the builder
-	WithOptionalValuesBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckReadPropertyBuilder
 	// Build builds the BACnetServiceAckReadProperty or returns an error if something is wrong
 	Build() (BACnetServiceAckReadProperty, error)
 	// MustBuild does the same as Build but panics on error
@@ -191,19 +191,6 @@ func (m *_BACnetServiceAckReadPropertyBuilder) WithOptionalValues(values BACnetC
 	return m
 }
 
-func (m *_BACnetServiceAckReadPropertyBuilder) WithOptionalValuesBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckReadPropertyBuilder {
-	builder := builderSupplier(m.Values.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.Values, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetServiceAckReadPropertyBuilder) Build() (BACnetServiceAckReadProperty, error) {
 	if m.ObjectIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
index ecdf29dddde..e4cfd209c69 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyConditional.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
index 2bf070bd3e8..2a0e781f0ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
index 06dfd046ed7..7544d97870d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -133,8 +135,6 @@ type BACnetServiceAckReadRangeBuilder interface {
 	WithItemCountBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetServiceAckReadRangeBuilder
 	// WithItemData adds ItemData (property field)
 	WithOptionalItemData(BACnetConstructedData) BACnetServiceAckReadRangeBuilder
-	// WithOptionalItemDataBuilder adds ItemData (property field) which is build by the builder
-	WithOptionalItemDataBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckReadRangeBuilder
 	// WithFirstSequenceNumber adds FirstSequenceNumber (property field)
 	WithOptionalFirstSequenceNumber(BACnetContextTagUnsignedInteger) BACnetServiceAckReadRangeBuilder
 	// WithOptionalFirstSequenceNumberBuilder adds FirstSequenceNumber (property field) which is build by the builder
@@ -257,19 +257,6 @@ func (m *_BACnetServiceAckReadRangeBuilder) WithOptionalItemData(itemData BACnet
 	return m
 }
 
-func (m *_BACnetServiceAckReadRangeBuilder) WithOptionalItemDataBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetServiceAckReadRangeBuilder {
-	builder := builderSupplier(m.ItemData.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ItemData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetServiceAckReadRangeBuilder) WithOptionalFirstSequenceNumber(firstSequenceNumber BACnetContextTagUnsignedInteger) BACnetServiceAckReadRangeBuilder {
 	m.FirstSequenceNumber = firstSequenceNumber
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
index 051cfabd516..da87e729ba6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckRequestKey.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
index aaa56bdb543..4cbc5618ce5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
index 4ed5abbfdf3..9b957e793d6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
index 7bf91b72801..637fe4d0e3c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupported.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
index 0486e941c99..172fabac23c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServicesSupportedTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
index 151643e1155..ede73ea5dee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSetpointReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
index b47be71f870..6b6f47fd891 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelAmount.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelAmount.go
index 54432ed9cac..d5db2aafc60 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelAmount.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelAmount.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelLevel.go
index 398058c3707..55c470aed2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelPercent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelPercent.go
index b01dac31966..6899c8669c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelPercent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevelPercent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
index 71b10144442..12def296f2f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
index 8c12d0011b7..6d58894e1e2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
index 6011f610124..2f71f3274a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
index 97f9eea5ff6..487bc125405 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSilencedStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
index 596275760af..a0240e3d505 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -84,8 +86,6 @@ type BACnetSpecialEventBuilder interface {
 	WithMandatoryFields(period BACnetSpecialEventPeriod, listOfTimeValues BACnetSpecialEventListOfTimeValues, eventPriority BACnetContextTagUnsignedInteger) BACnetSpecialEventBuilder
 	// WithPeriod adds Period (property field)
 	WithPeriod(BACnetSpecialEventPeriod) BACnetSpecialEventBuilder
-	// WithPeriodBuilder adds Period (property field) which is build by the builder
-	WithPeriodBuilder(func(BACnetSpecialEventPeriodBuilder) BACnetSpecialEventPeriodBuilder) BACnetSpecialEventBuilder
 	// WithListOfTimeValues adds ListOfTimeValues (property field)
 	WithListOfTimeValues(BACnetSpecialEventListOfTimeValues) BACnetSpecialEventBuilder
 	// WithListOfTimeValuesBuilder adds ListOfTimeValues (property field) which is build by the builder
@@ -122,19 +122,6 @@ func (m *_BACnetSpecialEventBuilder) WithPeriod(period BACnetSpecialEventPeriod)
 	return m
 }
 
-func (m *_BACnetSpecialEventBuilder) WithPeriodBuilder(builderSupplier func(BACnetSpecialEventPeriodBuilder) BACnetSpecialEventPeriodBuilder) BACnetSpecialEventBuilder {
-	builder := builderSupplier(m.Period.CreateBACnetSpecialEventPeriodBuilder())
-	var err error
-	m.Period, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetSpecialEventPeriodBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetSpecialEventBuilder) WithListOfTimeValues(listOfTimeValues BACnetSpecialEventListOfTimeValues) BACnetSpecialEventBuilder {
 	m.ListOfTimeValues = listOfTimeValues
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
index 0203dff8c92..7b56d214960 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventListOfTimeValues.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
index c6f6d33f9c6..a458f76db2d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarEntry.go
index a839cf73f07..37251e0ee7f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarReference.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarReference.go
index edb16fc94a9..1a0300cd364 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarReference.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriodCalendarReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
index d289a2e3a5e..f00c6a677d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlags.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
index 91d726d4469..03669655b78 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetStatusFlagsTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
index 359d3a83ecf..1dedb488ecc 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
index 1efe0b92584..4ff8cc4c53b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
index 16b81ec44d2..65ba8515816 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
@@ -22,10 +22,12 @@ package model
 import (
 	"context"
 	"fmt"
-	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
index 5443f8d5010..791aed188fb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
@@ -22,12 +22,14 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
index 22d4f825c3a..78da5eefc0d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
index 6752ea5fef5..7ed735d830b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
index 780d6e6ab19..290032c0d77 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
index dde2af78ef0..8392b7788d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
index 4328a0731b1..67284d7bc86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
index f61bf740065..cf8af44ec30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
index 163912bbfdd..62b08dfe758 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
index ef61d847feb..650cf50ae48 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
index 581f4d69abb..f8916d4bc86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
index 28fdbee8f58..0e600666350 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
index 9b550a26dcf..70b73338448 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
index 2ea39c46ebf..5360d33f33c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BACnetTimeStampEnclosedBuilder interface {
 	WithOpeningTagBuilder(func(BACnetOpeningTagBuilder) BACnetOpeningTagBuilder) BACnetTimeStampEnclosedBuilder
 	// WithTimestamp adds Timestamp (property field)
 	WithTimestamp(BACnetTimeStamp) BACnetTimeStampEnclosedBuilder
-	// WithTimestampBuilder adds Timestamp (property field) which is build by the builder
-	WithTimestampBuilder(func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetTimeStampEnclosedBuilder
 	// WithClosingTag adds ClosingTag (property field)
 	WithClosingTag(BACnetClosingTag) BACnetTimeStampEnclosedBuilder
 	// WithClosingTagBuilder adds ClosingTag (property field) which is build by the builder
@@ -143,19 +143,6 @@ func (m *_BACnetTimeStampEnclosedBuilder) WithTimestamp(timestamp BACnetTimeStam
 	return m
 }
 
-func (m *_BACnetTimeStampEnclosedBuilder) WithTimestampBuilder(builderSupplier func(BACnetTimeStampBuilder) BACnetTimeStampBuilder) BACnetTimeStampEnclosedBuilder {
-	builder := builderSupplier(m.Timestamp.CreateBACnetTimeStampBuilder())
-	var err error
-	m.Timestamp, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetTimeStampBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetTimeStampEnclosedBuilder) WithClosingTag(closingTag BACnetClosingTag) BACnetTimeStampEnclosedBuilder {
 	m.ClosingTag = closingTag
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampSequence.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampSequence.go
index 6a807945026..f12053a0611 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampSequence.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampSequence.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampTime.go
index 2737e4e341e..881ce4f2923 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
index e1767efe124..f4a82d81bb6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStampsEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
index 8201afb6089..17c7b07418d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
index bb73f24a857..2a574a2c15f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
index 63c7b0f8ed3..880e5f64d51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
index 15f97daae24..f2e6e4475c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBitString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
index 4258087632e..61bd0f19a6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
index 1bf57d77acb..26fe1a98ca8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueCharacterString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
index 6fc1928b1a5..a21eac111d2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueConstructedValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type BACnetTimerStateChangeValueConstructedValueBuilder interface {
 	WithMandatoryFields(constructedValue BACnetConstructedData) BACnetTimerStateChangeValueConstructedValueBuilder
 	// WithConstructedValue adds ConstructedValue (property field)
 	WithConstructedValue(BACnetConstructedData) BACnetTimerStateChangeValueConstructedValueBuilder
-	// WithConstructedValueBuilder adds ConstructedValue (property field) which is build by the builder
-	WithConstructedValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetTimerStateChangeValueConstructedValueBuilder
 	// Build builds the BACnetTimerStateChangeValueConstructedValue or returns an error if something is wrong
 	Build() (BACnetTimerStateChangeValueConstructedValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_BACnetTimerStateChangeValueConstructedValueBuilder) WithConstructedVal
 	return m
 }
 
-func (m *_BACnetTimerStateChangeValueConstructedValueBuilder) WithConstructedValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetTimerStateChangeValueConstructedValueBuilder {
-	builder := builderSupplier(m.ConstructedValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ConstructedValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetTimerStateChangeValueConstructedValueBuilder) Build() (BACnetTimerStateChangeValueConstructedValue, error) {
 	if m.ConstructedValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
index 7d1dc190815..b85913c0832 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
index f7910de9ae6..5814fd68934 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
index 71657a0f0f7..ebec7f3a560 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
index d7c69cb74db..78211ce72ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueEnumerated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
index 7085f190faa..51d8a6b426a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueInteger.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
index 65c81fa4d7f..2ca10659932 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueLightingCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
index 692e2ee23d2..dab565e5371 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNoValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
index ab32257a197..ac13d62a494 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
index 6171032b169..d0f907c3ec5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueObjectidentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
index 807c249c19f..195c7802d30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueOctetString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
index 324306de82a..a3b3c23daea 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueReal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
index f42ecff6153..55a39621e18 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
index f9ef30d634b..f7558ded779 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValueUnsigned.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
index 0f199b13d92..26d68507729 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
index b86b99e1b53..6d4cc551ba6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransition.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
index 3b5e7ed0c2c..474cf2b8cdb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerTransitionTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
index b1735152ca0..dfc2a449bd6 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoice.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
index c6a313fef8b..1d3e9458649 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceChoiceTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
index 0e4cf264f69..d2f71ecd922 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index 779ef17600b..3bbf9b9ce38 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
index fc14e0e684c..ebe5e7c8e11 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
index ab65d73295c..4523742c2a8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
index cc353ea2e31..ec7a913c26a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index 1c86cc48d8c..fe9627fc0ca 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
index 80ee108adaf..84155da31ad 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
index 89f731a2c00..2aa8bd6cc10 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -200,8 +202,6 @@ type BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder interfac
 	WithToStateBuilder(func(BACnetEventStateTaggedBuilder) BACnetEventStateTaggedBuilder) BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder
 	// WithEventValues adds EventValues (property field)
 	WithOptionalEventValues(BACnetNotificationParameters) BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder
-	// WithOptionalEventValuesBuilder adds EventValues (property field) which is build by the builder
-	WithOptionalEventValuesBuilder(func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder
 	// Build builds the BACnetUnconfirmedServiceRequestUnconfirmedEventNotification or returns an error if something is wrong
 	Build() (BACnetUnconfirmedServiceRequestUnconfirmedEventNotification, error)
 	// MustBuild does the same as Build but panics on error
@@ -446,19 +446,6 @@ func (m *_BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder) Wi
 	return m
 }
 
-func (m *_BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder) WithOptionalEventValuesBuilder(builderSupplier func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder {
-	builder := builderSupplier(m.EventValues.CreateBACnetNotificationParametersBuilder())
-	var err error
-	m.EventValues, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetNotificationParametersBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetUnconfirmedServiceRequestUnconfirmedEventNotificationBuilder) Build() (BACnetUnconfirmedServiceRequestUnconfirmedEventNotification, error) {
 	if m.ProcessIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index 76f7b6643d3..7b4c2b12f2c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -99,8 +101,6 @@ type BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder interface
 	WithServiceNumberBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder
 	// WithServiceParameters adds ServiceParameters (property field)
 	WithOptionalServiceParameters(BACnetConstructedData) BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder
-	// WithOptionalServiceParametersBuilder adds ServiceParameters (property field) which is build by the builder
-	WithOptionalServiceParametersBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder
 	// Build builds the BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer or returns an error if something is wrong
 	Build() (BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer, error)
 	// MustBuild does the same as Build but panics on error
@@ -165,19 +165,6 @@ func (m *_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder) With
 	return m
 }
 
-func (m *_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder) WithOptionalServiceParametersBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder {
-	builder := builderSupplier(m.ServiceParameters.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ServiceParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransferBuilder) Build() (BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer, error) {
 	if m.VendorId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
index b6fc7457f14..42a9b6a83e0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -102,8 +104,6 @@ type BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder interface {
 	WithTextMessageSourceDeviceBuilder(func(BACnetContextTagObjectIdentifierBuilder) BACnetContextTagObjectIdentifierBuilder) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder
 	// WithMessageClass adds MessageClass (property field)
 	WithOptionalMessageClass(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder
-	// WithOptionalMessageClassBuilder adds MessageClass (property field) which is build by the builder
-	WithOptionalMessageClassBuilder(func(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder
 	// WithMessagePriority adds MessagePriority (property field)
 	WithMessagePriority(BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder
 	// WithMessagePriorityBuilder adds MessagePriority (property field) which is build by the builder
@@ -158,19 +158,6 @@ func (m *_BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder) WithOpti
 	return m
 }
 
-func (m *_BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder) WithOptionalMessageClassBuilder(builderSupplier func(BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder {
-	builder := builderSupplier(m.MessageClass.CreateBACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder())
-	var err error
-	m.MessageClass, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder) WithMessagePriority(messagePriority BACnetConfirmedServiceRequestConfirmedTextMessageMessagePriorityTagged) BACnetUnconfirmedServiceRequestUnconfirmedTextMessageBuilder {
 	m.MessagePriority = messagePriority
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
index 9b8ec9808af..c426ec16a29 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnknown.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index 073c320f4c8..fce37cc80a9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type BACnetUnconfirmedServiceRequestWhoHasBuilder interface {
 	WithOptionalDeviceInstanceRangeHighLimitBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) BACnetUnconfirmedServiceRequestWhoHasBuilder
 	// WithObject adds Object (property field)
 	WithObject(BACnetUnconfirmedServiceRequestWhoHasObject) BACnetUnconfirmedServiceRequestWhoHasBuilder
-	// WithObjectBuilder adds Object (property field) which is build by the builder
-	WithObjectBuilder(func(BACnetUnconfirmedServiceRequestWhoHasObjectBuilder) BACnetUnconfirmedServiceRequestWhoHasObjectBuilder) BACnetUnconfirmedServiceRequestWhoHasBuilder
 	// Build builds the BACnetUnconfirmedServiceRequestWhoHas or returns an error if something is wrong
 	Build() (BACnetUnconfirmedServiceRequestWhoHas, error)
 	// MustBuild does the same as Build but panics on error
@@ -162,19 +162,6 @@ func (m *_BACnetUnconfirmedServiceRequestWhoHasBuilder) WithObject(object BACnet
 	return m
 }
 
-func (m *_BACnetUnconfirmedServiceRequestWhoHasBuilder) WithObjectBuilder(builderSupplier func(BACnetUnconfirmedServiceRequestWhoHasObjectBuilder) BACnetUnconfirmedServiceRequestWhoHasObjectBuilder) BACnetUnconfirmedServiceRequestWhoHasBuilder {
-	builder := builderSupplier(m.Object.CreateBACnetUnconfirmedServiceRequestWhoHasObjectBuilder())
-	var err error
-	m.Object, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetUnconfirmedServiceRequestWhoHasObjectBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BACnetUnconfirmedServiceRequestWhoHasBuilder) Build() (BACnetUnconfirmedServiceRequestWhoHas, error) {
 	if m.Object == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
index 9acf9550454..2988f8ae67a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectIdentifier.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectIdentifier.go
index d2782be374b..c63b0e0cf6e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectIdentifier.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectName.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectName.go
index 44d21dadfec..840d3ab9d07 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectName.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObjectName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index b883dc73278..c44f7230099 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
index b37a17514cf..13c8658d55e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
index 04b6f58919e..d777466c8a5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVMACEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
index b65c27eabb2..5cb90852f86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
index af6d2009a22..567018108e9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTClassTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
index 9740ade6a39..5c4bbdcc107 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVTSession.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
index 0920a4c1c03..2be47774e7c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceAddress.go
index 19896891bec..f458e642577 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceNone.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceNone.go
index e8cb396a6d9..65542f890c3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceNone.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceNone.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceObject.go
index 91c5be2de82..0f57eab62fd 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSourceObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index 165f968d34b..63f58f91122 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
index a1b64184506..29258f8aeb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorIdTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
index a81dc9b9496..47e44a239ec 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDay.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
index 0177b49996c..5b27f3bda75 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWeekNDayTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
index f7ab3b81637..a4c6b688431 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteAccessSpecification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
index 946f38d7ef4..3757a8b11c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
index 26dbff4b524..961817a8673 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetWriteStatusTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLC.go b/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
index b3d6d4d00a6..075ac1f6714 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLC.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
index 106c05a1257..b1d0bf8a326 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCBroadcastDistributionTableEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
index f4cdcfb7998..a5bf78d40ef 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
index 7e64b6ee81d..a36624a9a64 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
index 8036d58aa17..1af4f56de32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCForeignDeviceTableEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index 4f932969000..1271405ccde 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index d9762c02b5a..19025a1caa2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index 4392b86df9d..94aed52f1cb 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
index ddc16f2c581..6db338477ff 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
index a2ffddbc6db..8f34846bd98 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
index b8290a38d71..2e9ef1e8e6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
index c261ea4da06..ebcb82704ab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
index d0b4320ce55..7e396e0938a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCResult.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCResult.go
index ebbbb0805fe..249c1114bab 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCResult.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
index 88791946f01..ec49caf4d1d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
index 4a1f776ca7b..3e2a6c98637 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCResultCodeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
index 1f32c364128..e12c57735b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCSecureBVLL.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go b/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
index 6349759642b..2ed77571f70 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BacnetConstants.go b/plc4go/protocols/bacnetip/readwrite/model/BacnetConstants.go
index 5c82a70a83b..3fa4632177e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BacnetConstants.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BacnetConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ChangeListAddError.go b/plc4go/protocols/bacnetip/readwrite/model/ChangeListAddError.go
index f0c2e1ef386..480881d5a39 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ChangeListAddError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ChangeListAddError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ChangeListRemoveError.go b/plc4go/protocols/bacnetip/readwrite/model/ChangeListRemoveError.go
index dde8d5bdfdd..bd3da2bb2c1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ChangeListRemoveError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ChangeListRemoveError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
index e61597ef80a..825492d6c05 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedEventNotificationRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -180,8 +182,6 @@ type ConfirmedEventNotificationRequestBuilder interface {
 	WithToStateBuilder(func(BACnetEventStateTaggedBuilder) BACnetEventStateTaggedBuilder) ConfirmedEventNotificationRequestBuilder
 	// WithEventValues adds EventValues (property field)
 	WithOptionalEventValues(BACnetNotificationParameters) ConfirmedEventNotificationRequestBuilder
-	// WithOptionalEventValuesBuilder adds EventValues (property field) which is build by the builder
-	WithOptionalEventValuesBuilder(func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) ConfirmedEventNotificationRequestBuilder
 	// Build builds the ConfirmedEventNotificationRequest or returns an error if something is wrong
 	Build() (ConfirmedEventNotificationRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -426,19 +426,6 @@ func (m *_ConfirmedEventNotificationRequestBuilder) WithOptionalEventValues(even
 	return m
 }
 
-func (m *_ConfirmedEventNotificationRequestBuilder) WithOptionalEventValuesBuilder(builderSupplier func(BACnetNotificationParametersBuilder) BACnetNotificationParametersBuilder) ConfirmedEventNotificationRequestBuilder {
-	builder := builderSupplier(m.EventValues.CreateBACnetNotificationParametersBuilder())
-	var err error
-	m.EventValues, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetNotificationParametersBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ConfirmedEventNotificationRequestBuilder) Build() (ConfirmedEventNotificationRequest, error) {
 	if m.ProcessIdentifier == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
index 6da4ccc826c..75f3e1cfec3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ConfirmedPrivateTransferError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -110,8 +112,6 @@ type ConfirmedPrivateTransferErrorBuilder interface {
 	WithServiceNumberBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) ConfirmedPrivateTransferErrorBuilder
 	// WithErrorParameters adds ErrorParameters (property field)
 	WithOptionalErrorParameters(BACnetConstructedData) ConfirmedPrivateTransferErrorBuilder
-	// WithOptionalErrorParametersBuilder adds ErrorParameters (property field) which is build by the builder
-	WithOptionalErrorParametersBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) ConfirmedPrivateTransferErrorBuilder
 	// Build builds the ConfirmedPrivateTransferError or returns an error if something is wrong
 	Build() (ConfirmedPrivateTransferError, error)
 	// MustBuild does the same as Build but panics on error
@@ -194,19 +194,6 @@ func (m *_ConfirmedPrivateTransferErrorBuilder) WithOptionalErrorParameters(erro
 	return m
 }
 
-func (m *_ConfirmedPrivateTransferErrorBuilder) WithOptionalErrorParametersBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) ConfirmedPrivateTransferErrorBuilder {
-	builder := builderSupplier(m.ErrorParameters.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.ErrorParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ConfirmedPrivateTransferErrorBuilder) Build() (ConfirmedPrivateTransferError, error) {
 	if m.ErrorType == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/CreateObjectError.go b/plc4go/protocols/bacnetip/readwrite/model/CreateObjectError.go
index 128b6345428..1150670ad27 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/CreateObjectError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/CreateObjectError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/Error.go b/plc4go/protocols/bacnetip/readwrite/model/Error.go
index 51ac85d45d8..5e1e9688429 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/Error.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/Error.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
index 54569102b0b..904ae148e9c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
index 54c547061ee..c9ff72e315b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorClassTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
index 74ee441365f..69c02bea2d3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
index fd79b31ff10..55f441899a1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorCodeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go b/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
index 460ded09553..ca6ea53b738 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ErrorEnclosed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
index 1e6988bbed5..e2b6d8f3e53 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotifications.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
index 0d9cccb8e4e..ca8cdad67f2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
index 371c20eae33..3d6b4ffaf11 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/ListOfCovNotificationsValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -95,8 +97,6 @@ type ListOfCovNotificationsValueBuilder interface {
 	WithOptionalArrayIndexBuilder(func(BACnetContextTagUnsignedIntegerBuilder) BACnetContextTagUnsignedIntegerBuilder) ListOfCovNotificationsValueBuilder
 	// WithPropertyValue adds PropertyValue (property field)
 	WithPropertyValue(BACnetConstructedData) ListOfCovNotificationsValueBuilder
-	// WithPropertyValueBuilder adds PropertyValue (property field) which is build by the builder
-	WithPropertyValueBuilder(func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) ListOfCovNotificationsValueBuilder
 	// WithTimeOfChange adds TimeOfChange (property field)
 	WithOptionalTimeOfChange(BACnetContextTagTime) ListOfCovNotificationsValueBuilder
 	// WithOptionalTimeOfChangeBuilder adds TimeOfChange (property field) which is build by the builder
@@ -165,19 +165,6 @@ func (m *_ListOfCovNotificationsValueBuilder) WithPropertyValue(propertyValue BA
 	return m
 }
 
-func (m *_ListOfCovNotificationsValueBuilder) WithPropertyValueBuilder(builderSupplier func(BACnetConstructedDataBuilder) BACnetConstructedDataBuilder) ListOfCovNotificationsValueBuilder {
-	builder := builderSupplier(m.PropertyValue.CreateBACnetConstructedDataBuilder())
-	var err error
-	m.PropertyValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "BACnetConstructedDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ListOfCovNotificationsValueBuilder) WithOptionalTimeOfChange(timeOfChange BACnetContextTagTime) ListOfCovNotificationsValueBuilder {
 	m.TimeOfChange = timeOfChange
 	return m
diff --git a/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
index 0e260868565..51b11e8d326 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/MaxApduLengthAccepted.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go b/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
index 4ef7cd58207..d6ac8a5e49e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/MaxSegmentsAccepted.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLM.go b/plc4go/protocols/bacnetip/readwrite/model/NLM.go
index abc82e213b0..2dbbc177a4c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLM.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLM.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go b/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
index f0a9677fba3..286c441bd0b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMChallengeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
index 9abf91f9f87..3dc6596142d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
index 2c2cb097706..3b318386471 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index 70d60baf208..b7e8124ba30 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
index ee4c0e8d70c..33ff446aae5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
index 72574d39913..0e7f5618f91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTable.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
index feaa40903ed..514b8c2dee0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTableAck.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
index c1391be882e..5bf8d27e27c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMInitializeRoutingTablePortMapping.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go b/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
index b3fe5a0464a..134a0f06b4b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMNetworkNumberIs.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
index 521e63fb57a..c98d565a9e1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go
index 85dbe6faee0..4be58252e13 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
index a5653bb2fdb..e8a18a1a166 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestKeyUpdate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
index f7afcda68e7..f8fc860ced3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRequestMasterKey.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go b/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
index fef5b851401..cd84241eb3a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMReserved.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
index acaccae5f60..eb803079dc2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
index 53d76767e62..627a29a737f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
index 8f95d78a037..f48d467ae52 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityPayload.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
index 9bb8a0b118e..63ea7b4f99d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSecurityResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
index 32cef09b38b..b60864f2d32 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMSetMasterKey.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
index 24b985f166d..db353d787a4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyDistributionKey.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
index 138894ae3c3..d1be3c9f7d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
index 0aaef15f5c5..b0ea3a6f32d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateControlFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
index b48a184f5e8..8b2e541275d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMUpdateKeyUpdateKeyEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go b/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
index 8b4a1d87036..280c08cdf11 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMVendorProprietaryMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go b/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
index faa0b5f6f57..e7371a97960 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMWhatIsNetworkNumber.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index 7b2eaa2258d..6338c1756c5 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
index 290e1be668c..5004176c421 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -131,12 +133,8 @@ type NPDUBuilder interface {
 	WithOptionalHopCount(uint8) NPDUBuilder
 	// WithNlm adds Nlm (property field)
 	WithOptionalNlm(NLM) NPDUBuilder
-	// WithOptionalNlmBuilder adds Nlm (property field) which is build by the builder
-	WithOptionalNlmBuilder(func(NLMBuilder) NLMBuilder) NPDUBuilder
 	// WithApdu adds Apdu (property field)
 	WithOptionalApdu(APDU) NPDUBuilder
-	// WithOptionalApduBuilder adds Apdu (property field) which is build by the builder
-	WithOptionalApduBuilder(func(APDUBuilder) APDUBuilder) NPDUBuilder
 	// Build builds the NPDU or returns an error if something is wrong
 	Build() (NPDU, error)
 	// MustBuild does the same as Build but panics on error
@@ -223,37 +221,11 @@ func (m *_NPDUBuilder) WithOptionalNlm(nlm NLM) NPDUBuilder {
 	return m
 }
 
-func (m *_NPDUBuilder) WithOptionalNlmBuilder(builderSupplier func(NLMBuilder) NLMBuilder) NPDUBuilder {
-	builder := builderSupplier(m.Nlm.CreateNLMBuilder())
-	var err error
-	m.Nlm, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "NLMBuilder failed"))
-	}
-	return m
-}
-
 func (m *_NPDUBuilder) WithOptionalApdu(apdu APDU) NPDUBuilder {
 	m.Apdu = apdu
 	return m
 }
 
-func (m *_NPDUBuilder) WithOptionalApduBuilder(builderSupplier func(APDUBuilder) APDUBuilder) NPDUBuilder {
-	builder := builderSupplier(m.Apdu.CreateAPDUBuilder())
-	var err error
-	m.Apdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "APDUBuilder failed"))
-	}
-	return m
-}
-
 func (m *_NPDUBuilder) Build() (NPDU, error) {
 	if m.Control == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
index 69b9807ad61..3b963f0d495 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
index f55014efe48..36cd6e6c93e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriority.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
index 4b855451eae..e7cc29e16d9 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDUNetworkPriorityTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCode.go b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCode.go
index 560f43c2ab9..75b6b7316d4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCode.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
index 853cbe9912c..84b6f213851 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SecurityResponseCodeTagged.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleError.go b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleError.go
index d57ba0607a3..3614c014b91 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
index 3e602d320c4..bc5e6447b81 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/SubscribeCOVPropertyMultipleErrorFirstFailedSubscription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/TagClass.go b/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
index b4b618e9afa..25ff9791c6c 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/TagClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go b/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
index fe5a8d25fed..e122fb67167 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/VTCloseError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go b/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
index e04a8a3b441..fc7271a79e4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/VTCloseErrorListOfVTSessionIdentifiers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/bacnetip/readwrite/model/WritePropertyMultipleError.go b/plc4go/protocols/bacnetip/readwrite/model/WritePropertyMultipleError.go
index 3fed5403ad0..3557f69c3b2 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/WritePropertyMultipleError.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/WritePropertyMultipleError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/ParserHelper.go b/plc4go/protocols/cbus/readwrite/ParserHelper.go
index 40d244e22b1..3fcf4f7b1be 100644
--- a/plc4go/protocols/cbus/readwrite/ParserHelper.go
+++ b/plc4go/protocols/cbus/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/XmlParserHelper.go b/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
index ab7296b9899..a820948e119 100644
--- a/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/cbus/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
index 52ffb112a55..24c8d0663b5 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCategory.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
index 8827052b17d..1b1dd88045a 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
index 1f8056eff21..1eed7dc8451 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlData.go b/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
index 2e7a905e16c..26157d2d0c0 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointClosed.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointClosed.go
index 84e67bdd029..c693e0c50ba 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointClosed.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointClosed.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointForcedOpen.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointForcedOpen.go
index b94d23ab938..ad08fdbb111 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointForcedOpen.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointForcedOpen.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointLeftOpen.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointLeftOpen.go
index e43702d7cca..deb300cc085 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointLeftOpen.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataAccessPointLeftOpen.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataCloseAccessPoint.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataCloseAccessPoint.go
index 43da56905f6..0f0ef278307 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataCloseAccessPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataCloseAccessPoint.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataInvalidAccessRequest.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataInvalidAccessRequest.go
index 50c5719c0e3..84c1afade4c 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataInvalidAccessRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataInvalidAccessRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataLockAccessPoint.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataLockAccessPoint.go
index c9ae416ac72..8c582df8a9b 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataLockAccessPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataLockAccessPoint.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataRequestToExit.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataRequestToExit.go
index df1daadb417..5897b29dbad 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataRequestToExit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataRequestToExit.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDataValidAccessRequest.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDataValidAccessRequest.go
index 80a97a7ee71..3eef8014b28 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDataValidAccessRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDataValidAccessRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go b/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
index 1167120ba9e..1600fafddff 100644
--- a/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
+++ b/plc4go/protocols/cbus/readwrite/model/AccessControlDirection.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
index 12630d45270..11ee95b1e56 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
index 413a1b86011..d52e7c602ec 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
index b7c876818e2..6fdb9651b27 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
index 0ef91d24e67..7b346c7ea77 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHumidityScheduleEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
index 4ade0dd007e..3c7d2fc981e 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataHvacScheduleEntry.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataRefresh.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataRefresh.go
index 158c723fdd8..81f77103446 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataRefresh.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataRefresh.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityLowerGuardLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityLowerGuardLimit.go
index a42c83cecc2..cb3687813b1 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityLowerGuardLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityLowerGuardLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumiditySetbackLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumiditySetbackLimit.go
index 48e7a8281be..b71f40b42ce 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumiditySetbackLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumiditySetbackLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityUpperGuardLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityUpperGuardLimit.go
index ee3f4c729fb..f556daaba72 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityUpperGuardLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHumidityUpperGuardLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacLowerGuardLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacLowerGuardLimit.go
index 71ac0eb76ef..529dc9fa4a0 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacLowerGuardLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacLowerGuardLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacSetbackLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacSetbackLimit.go
index 963eafb437c..92e5460b24b 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacSetbackLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacSetbackLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacUpperGuardLimit.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacUpperGuardLimit.go
index a46db8eb5d6..caadd409608 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacUpperGuardLimit.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetHvacUpperGuardLimit.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
index 96d87380e64..1525b207c1c 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHumidityLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
index 6d3a5617fb4..d07a7f118ad 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetPlantHvacLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOff.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOff.go
index 5aa527b0989..2f8b2ffdfef 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOff.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOn.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOn.go
index e4017bfbc1d..0a5188fdac4 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOn.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneGroupOn.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
index 9b855dd1e57..a7057a0ca39 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHumidityMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
index 492aae32e0b..1add869c42b 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataSetZoneHvacMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidity.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidity.go
index 54751498778..cca12df3b69 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidity.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidity.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidityPlantStatus.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidityPlantStatus.go
index 7bf6d973604..1bf3e3ea026 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidityPlantStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHumidityPlantStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHvacPlantStatus.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHvacPlantStatus.go
index 81e9e573a58..c95d7a285af 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHvacPlantStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneHvacPlantStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneTemperature.go b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneTemperature.go
index 883a3440e07..cb37b5dd905 100644
--- a/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneTemperature.go
+++ b/plc4go/protocols/cbus/readwrite/model/AirConditioningDataZoneTemperature.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Alpha.go b/plc4go/protocols/cbus/readwrite/model/Alpha.go
index 47a74d67e25..c5da2131122 100644
--- a/plc4go/protocols/cbus/readwrite/model/Alpha.go
+++ b/plc4go/protocols/cbus/readwrite/model/Alpha.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
index 0bee9c9619b..e5df6211741 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
index c9cef24635e..e5d2d664358 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationAddress2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationId.go b/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
index f28e934aaee..078fea0fd95 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationId.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go b/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
index 92f16aaae19..cf7e46c908d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ApplicationIdContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Attribute.go b/plc4go/protocols/cbus/readwrite/model/Attribute.go
index 75d02b5096c..0ec7c1bbaf6 100644
--- a/plc4go/protocols/cbus/readwrite/model/Attribute.go
+++ b/plc4go/protocols/cbus/readwrite/model/Attribute.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go b/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
index 64a027ce871..f4d62fb6836 100644
--- a/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
+++ b/plc4go/protocols/cbus/readwrite/model/BaudRateSelector.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go b/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
index e6beeb8873f..0af4c582262 100644
--- a/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/BridgeAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALCommandType.go b/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
index 0a7fca43c8c..101eee306c6 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
index b5f00cfa058..b27f6502ecb 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALData.go b/plc4go/protocols/cbus/readwrite/model/CALData.go
index 4ad7a782921..b2fcc3a5e10 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -104,8 +106,6 @@ type CALDataBuilder interface {
 	WithCommandTypeContainer(CALCommandTypeContainer) CALDataBuilder
 	// WithAdditionalData adds AdditionalData (property field)
 	WithOptionalAdditionalData(CALData) CALDataBuilder
-	// WithOptionalAdditionalDataBuilder adds AdditionalData (property field) which is build by the builder
-	WithOptionalAdditionalDataBuilder(func(CALDataBuilder) CALDataBuilder) CALDataBuilder
 	// Build builds the CALData or returns an error if something is wrong
 	Build() (CALDataContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_CALDataBuilder) WithOptionalAdditionalData(additionalData CALData) CAL
 	return m
 }
 
-func (m *_CALDataBuilder) WithOptionalAdditionalDataBuilder(builderSupplier func(CALDataBuilder) CALDataBuilder) CALDataBuilder {
-	builder := builderSupplier(m.AdditionalData.CreateCALDataBuilder())
-	var err error
-	m.AdditionalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CALDataBuilder) Build() (CALDataContract, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go b/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
index 2720cd4223a..5b1974bbf72 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataAcknowledge.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go b/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
index 8f85fb7056f..af1fd8d8425 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataGetStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go b/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
index 1f9e8f2119a..85579f42fc5 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataIdentify.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
index 3ee6e5327d4..fb66a2e646d 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataIdentifyReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type CALDataIdentifyReplyBuilder interface {
 	WithAttribute(Attribute) CALDataIdentifyReplyBuilder
 	// WithIdentifyReplyCommand adds IdentifyReplyCommand (property field)
 	WithIdentifyReplyCommand(IdentifyReplyCommand) CALDataIdentifyReplyBuilder
-	// WithIdentifyReplyCommandBuilder adds IdentifyReplyCommand (property field) which is build by the builder
-	WithIdentifyReplyCommandBuilder(func(IdentifyReplyCommandBuilder) IdentifyReplyCommandBuilder) CALDataIdentifyReplyBuilder
 	// Build builds the CALDataIdentifyReply or returns an error if something is wrong
 	Build() (CALDataIdentifyReply, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_CALDataIdentifyReplyBuilder) WithIdentifyReplyCommand(identifyReplyCom
 	return m
 }
 
-func (m *_CALDataIdentifyReplyBuilder) WithIdentifyReplyCommandBuilder(builderSupplier func(IdentifyReplyCommandBuilder) IdentifyReplyCommandBuilder) CALDataIdentifyReplyBuilder {
-	builder := builderSupplier(m.IdentifyReplyCommand.CreateIdentifyReplyCommandBuilder())
-	var err error
-	m.IdentifyReplyCommand, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "IdentifyReplyCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CALDataIdentifyReplyBuilder) Build() (CALDataIdentifyReply, error) {
 	if m.IdentifyReplyCommand == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go b/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
index 074a1258e1c..7eb0122d825 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataRecall.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
index 3fcd571532e..a87dd32fae0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type CALDataReplyBuilder interface {
 	WithParamNo(Parameter) CALDataReplyBuilder
 	// WithParameterValue adds ParameterValue (property field)
 	WithParameterValue(ParameterValue) CALDataReplyBuilder
-	// WithParameterValueBuilder adds ParameterValue (property field) which is build by the builder
-	WithParameterValueBuilder(func(ParameterValueBuilder) ParameterValueBuilder) CALDataReplyBuilder
 	// Build builds the CALDataReply or returns an error if something is wrong
 	Build() (CALDataReply, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_CALDataReplyBuilder) WithParameterValue(parameterValue ParameterValue)
 	return m
 }
 
-func (m *_CALDataReplyBuilder) WithParameterValueBuilder(builderSupplier func(ParameterValueBuilder) ParameterValueBuilder) CALDataReplyBuilder {
-	builder := builderSupplier(m.ParameterValue.CreateParameterValueBuilder())
-	var err error
-	m.ParameterValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ParameterValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CALDataReplyBuilder) Build() (CALDataReply, error) {
 	if m.ParameterValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataReset.go b/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
index 584400841ff..00856795034 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataReset.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
index 60a683738e1..3320b638976 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
index 8ceba728928..9a452c96805 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataStatusExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
index 6e0cf38060f..3fe1485f8a2 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALDataWrite.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type CALDataWriteBuilder interface {
 	WithCode(byte) CALDataWriteBuilder
 	// WithParameterValue adds ParameterValue (property field)
 	WithParameterValue(ParameterValue) CALDataWriteBuilder
-	// WithParameterValueBuilder adds ParameterValue (property field) which is build by the builder
-	WithParameterValueBuilder(func(ParameterValueBuilder) ParameterValueBuilder) CALDataWriteBuilder
 	// Build builds the CALDataWrite or returns an error if something is wrong
 	Build() (CALDataWrite, error)
 	// MustBuild does the same as Build but panics on error
@@ -132,19 +132,6 @@ func (m *_CALDataWriteBuilder) WithParameterValue(parameterValue ParameterValue)
 	return m
 }
 
-func (m *_CALDataWriteBuilder) WithParameterValueBuilder(builderSupplier func(ParameterValueBuilder) ParameterValueBuilder) CALDataWriteBuilder {
-	builder := builderSupplier(m.ParameterValue.CreateParameterValueBuilder())
-	var err error
-	m.ParameterValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ParameterValueBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CALDataWriteBuilder) Build() (CALDataWrite, error) {
 	if m.ParameterValue == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReply.go b/plc4go/protocols/cbus/readwrite/model/CALReply.go
index ce7d00c187e..adb79980ca0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -104,8 +106,6 @@ type CALReplyBuilder interface {
 	WithCalType(byte) CALReplyBuilder
 	// WithCalData adds CalData (property field)
 	WithCalData(CALData) CALReplyBuilder
-	// WithCalDataBuilder adds CalData (property field) which is build by the builder
-	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) CALReplyBuilder
 	// Build builds the CALReply or returns an error if something is wrong
 	Build() (CALReplyContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_CALReplyBuilder) WithCalData(calData CALData) CALReplyBuilder {
 	return m
 }
 
-func (m *_CALReplyBuilder) WithCalDataBuilder(builderSupplier func(CALDataBuilder) CALDataBuilder) CALReplyBuilder {
-	builder := builderSupplier(m.CalData.CreateCALDataBuilder())
-	var err error
-	m.CalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CALReplyBuilder) Build() (CALReplyContract, error) {
 	if m.CalData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
index 8d808bad42a..7874a38e718 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go b/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
index 24cda89cc95..cdff14ea78f 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyShort.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
index 6cdd1432c2e..891de7df2db 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
index caa1139de70..07fdf167906 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandDeviceManagement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
index b4a97d74539..ed0307e4813 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CBusCommandPointToMultiPointBuilder interface {
 	WithMandatoryFields(command CBusPointToMultiPointCommand) CBusCommandPointToMultiPointBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(CBusPointToMultiPointCommand) CBusCommandPointToMultiPointBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(CBusPointToMultiPointCommandBuilder) CBusPointToMultiPointCommandBuilder) CBusCommandPointToMultiPointBuilder
 	// Build builds the CBusCommandPointToMultiPoint or returns an error if something is wrong
 	Build() (CBusCommandPointToMultiPoint, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CBusCommandPointToMultiPointBuilder) WithCommand(command CBusPointToMu
 	return m
 }
 
-func (m *_CBusCommandPointToMultiPointBuilder) WithCommandBuilder(builderSupplier func(CBusPointToMultiPointCommandBuilder) CBusPointToMultiPointCommandBuilder) CBusCommandPointToMultiPointBuilder {
-	builder := builderSupplier(m.Command.CreateCBusPointToMultiPointCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CBusPointToMultiPointCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusCommandPointToMultiPointBuilder) Build() (CBusCommandPointToMultiPoint, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
index d4fc4897510..03e755137e1 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CBusCommandPointToPointBuilder interface {
 	WithMandatoryFields(command CBusPointToPointCommand) CBusCommandPointToPointBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(CBusPointToPointCommand) CBusCommandPointToPointBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(CBusPointToPointCommandBuilder) CBusPointToPointCommandBuilder) CBusCommandPointToPointBuilder
 	// Build builds the CBusCommandPointToPoint or returns an error if something is wrong
 	Build() (CBusCommandPointToPoint, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CBusCommandPointToPointBuilder) WithCommand(command CBusPointToPointCo
 	return m
 }
 
-func (m *_CBusCommandPointToPointBuilder) WithCommandBuilder(builderSupplier func(CBusPointToPointCommandBuilder) CBusPointToPointCommandBuilder) CBusCommandPointToPointBuilder {
-	builder := builderSupplier(m.Command.CreateCBusPointToPointCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CBusPointToPointCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusCommandPointToPointBuilder) Build() (CBusCommandPointToPoint, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
index a1454ddeab4..408ef3e8452 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CBusCommandPointToPointToMultiPointBuilder interface {
 	WithMandatoryFields(command CBusPointToPointToMultiPointCommand) CBusCommandPointToPointToMultiPointBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(CBusPointToPointToMultiPointCommand) CBusCommandPointToPointToMultiPointBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(CBusPointToPointToMultiPointCommandBuilder) CBusPointToPointToMultiPointCommandBuilder) CBusCommandPointToPointToMultiPointBuilder
 	// Build builds the CBusCommandPointToPointToMultiPoint or returns an error if something is wrong
 	Build() (CBusCommandPointToPointToMultiPoint, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CBusCommandPointToPointToMultiPointBuilder) WithCommand(command CBusPo
 	return m
 }
 
-func (m *_CBusCommandPointToPointToMultiPointBuilder) WithCommandBuilder(builderSupplier func(CBusPointToPointToMultiPointCommandBuilder) CBusPointToPointToMultiPointCommandBuilder) CBusCommandPointToPointToMultiPointBuilder {
-	builder := builderSupplier(m.Command.CreateCBusPointToPointToMultiPointCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CBusPointToPointToMultiPointCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusCommandPointToPointToMultiPointBuilder) Build() (CBusCommandPointToPointToMultiPoint, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusConstants.go b/plc4go/protocols/cbus/readwrite/model/CBusConstants.go
index 30c78baf218..9217fea90d8 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusConstants.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusHeader.go b/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
index 4fdb36cdeee..2cb46eb0d8d 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessage.go b/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
index 35e885b83be..5846454b551 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessage.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go b/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
index 1970db49b85..b2021307af5 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessageToClient.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CBusMessageToClientBuilder interface {
 	WithMandatoryFields(reply ReplyOrConfirmation) CBusMessageToClientBuilder
 	// WithReply adds Reply (property field)
 	WithReply(ReplyOrConfirmation) CBusMessageToClientBuilder
-	// WithReplyBuilder adds Reply (property field) which is build by the builder
-	WithReplyBuilder(func(ReplyOrConfirmationBuilder) ReplyOrConfirmationBuilder) CBusMessageToClientBuilder
 	// Build builds the CBusMessageToClient or returns an error if something is wrong
 	Build() (CBusMessageToClient, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CBusMessageToClientBuilder) WithReply(reply ReplyOrConfirmation) CBusM
 	return m
 }
 
-func (m *_CBusMessageToClientBuilder) WithReplyBuilder(builderSupplier func(ReplyOrConfirmationBuilder) ReplyOrConfirmationBuilder) CBusMessageToClientBuilder {
-	builder := builderSupplier(m.Reply.CreateReplyOrConfirmationBuilder())
-	var err error
-	m.Reply, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ReplyOrConfirmationBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusMessageToClientBuilder) Build() (CBusMessageToClient, error) {
 	if m.Reply == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go b/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
index 404fff028bf..7ffdeffee59 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusMessageToServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CBusMessageToServerBuilder interface {
 	WithMandatoryFields(request Request) CBusMessageToServerBuilder
 	// WithRequest adds Request (property field)
 	WithRequest(Request) CBusMessageToServerBuilder
-	// WithRequestBuilder adds Request (property field) which is build by the builder
-	WithRequestBuilder(func(RequestBuilder) RequestBuilder) CBusMessageToServerBuilder
 	// Build builds the CBusMessageToServer or returns an error if something is wrong
 	Build() (CBusMessageToServer, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CBusMessageToServerBuilder) WithRequest(request Request) CBusMessageTo
 	return m
 }
 
-func (m *_CBusMessageToServerBuilder) WithRequestBuilder(builderSupplier func(RequestBuilder) RequestBuilder) CBusMessageToServerBuilder {
-	builder := builderSupplier(m.Request.CreateRequestBuilder())
-	var err error
-	m.Request, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "RequestBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusMessageToServerBuilder) Build() (CBusMessageToServer, error) {
 	if m.Request == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusOptions.go b/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
index f16649ef325..394f647a773 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusOptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
index 6f61029801c..9b0fdff4e97 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
index 69cf838322a..27ed1d96994 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type CBusPointToMultiPointCommandNormalBuilder interface {
 	WithApplication(ApplicationIdContainer) CBusPointToMultiPointCommandNormalBuilder
 	// WithSalData adds SalData (property field)
 	WithSalData(SALData) CBusPointToMultiPointCommandNormalBuilder
-	// WithSalDataBuilder adds SalData (property field) which is build by the builder
-	WithSalDataBuilder(func(SALDataBuilder) SALDataBuilder) CBusPointToMultiPointCommandNormalBuilder
 	// Build builds the CBusPointToMultiPointCommandNormal or returns an error if something is wrong
 	Build() (CBusPointToMultiPointCommandNormal, error)
 	// MustBuild does the same as Build but panics on error
@@ -123,19 +123,6 @@ func (m *_CBusPointToMultiPointCommandNormalBuilder) WithSalData(salData SALData
 	return m
 }
 
-func (m *_CBusPointToMultiPointCommandNormalBuilder) WithSalDataBuilder(builderSupplier func(SALDataBuilder) SALDataBuilder) CBusPointToMultiPointCommandNormalBuilder {
-	builder := builderSupplier(m.SalData.CreateSALDataBuilder())
-	var err error
-	m.SalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusPointToMultiPointCommandNormalBuilder) Build() (CBusPointToMultiPointCommandNormal, error) {
 	if m.SalData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
index 3dc71f43848..0db873da379 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -83,8 +85,6 @@ type CBusPointToMultiPointCommandStatusBuilder interface {
 	WithMandatoryFields(statusRequest StatusRequest) CBusPointToMultiPointCommandStatusBuilder
 	// WithStatusRequest adds StatusRequest (property field)
 	WithStatusRequest(StatusRequest) CBusPointToMultiPointCommandStatusBuilder
-	// WithStatusRequestBuilder adds StatusRequest (property field) which is build by the builder
-	WithStatusRequestBuilder(func(StatusRequestBuilder) StatusRequestBuilder) CBusPointToMultiPointCommandStatusBuilder
 	// Build builds the CBusPointToMultiPointCommandStatus or returns an error if something is wrong
 	Build() (CBusPointToMultiPointCommandStatus, error)
 	// MustBuild does the same as Build but panics on error
@@ -113,19 +113,6 @@ func (m *_CBusPointToMultiPointCommandStatusBuilder) WithStatusRequest(statusReq
 	return m
 }
 
-func (m *_CBusPointToMultiPointCommandStatusBuilder) WithStatusRequestBuilder(builderSupplier func(StatusRequestBuilder) StatusRequestBuilder) CBusPointToMultiPointCommandStatusBuilder {
-	builder := builderSupplier(m.StatusRequest.CreateStatusRequestBuilder())
-	var err error
-	m.StatusRequest, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "StatusRequestBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusPointToMultiPointCommandStatusBuilder) Build() (CBusPointToMultiPointCommandStatus, error) {
 	if m.StatusRequest == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
index 465933478b5..a39f1c32485 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -103,8 +105,6 @@ type CBusPointToPointCommandBuilder interface {
 	WithBridgeAddressCountPeek(uint16) CBusPointToPointCommandBuilder
 	// WithCalData adds CalData (property field)
 	WithCalData(CALData) CBusPointToPointCommandBuilder
-	// WithCalDataBuilder adds CalData (property field) which is build by the builder
-	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) CBusPointToPointCommandBuilder
 	// Build builds the CBusPointToPointCommand or returns an error if something is wrong
 	Build() (CBusPointToPointCommandContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -138,19 +138,6 @@ func (m *_CBusPointToPointCommandBuilder) WithCalData(calData CALData) CBusPoint
 	return m
 }
 
-func (m *_CBusPointToPointCommandBuilder) WithCalDataBuilder(builderSupplier func(CALDataBuilder) CALDataBuilder) CBusPointToPointCommandBuilder {
-	builder := builderSupplier(m.CalData.CreateCALDataBuilder())
-	var err error
-	m.CalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusPointToPointCommandBuilder) Build() (CBusPointToPointCommandContract, error) {
 	if m.CalData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
index 6de6a28b124..3cff125b9e0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandDirect.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
index 3702bc71736..e13247067ed 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
index d6ae39582e2..611ad99fd47 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
index 433674d9053..2f37a788a75 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandNormal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type CBusPointToPointToMultiPointCommandNormalBuilder interface {
 	WithApplication(ApplicationIdContainer) CBusPointToPointToMultiPointCommandNormalBuilder
 	// WithSalData adds SalData (property field)
 	WithSalData(SALData) CBusPointToPointToMultiPointCommandNormalBuilder
-	// WithSalDataBuilder adds SalData (property field) which is build by the builder
-	WithSalDataBuilder(func(SALDataBuilder) SALDataBuilder) CBusPointToPointToMultiPointCommandNormalBuilder
 	// Build builds the CBusPointToPointToMultiPointCommandNormal or returns an error if something is wrong
 	Build() (CBusPointToPointToMultiPointCommandNormal, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_CBusPointToPointToMultiPointCommandNormalBuilder) WithSalData(salData
 	return m
 }
 
-func (m *_CBusPointToPointToMultiPointCommandNormalBuilder) WithSalDataBuilder(builderSupplier func(SALDataBuilder) SALDataBuilder) CBusPointToPointToMultiPointCommandNormalBuilder {
-	builder := builderSupplier(m.SalData.CreateSALDataBuilder())
-	var err error
-	m.SalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusPointToPointToMultiPointCommandNormalBuilder) Build() (CBusPointToPointToMultiPointCommandNormal, error) {
 	if m.SalData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
index ac053930188..f02b1aa7dad 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommandStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type CBusPointToPointToMultiPointCommandStatusBuilder interface {
 	WithMandatoryFields(statusRequest StatusRequest) CBusPointToPointToMultiPointCommandStatusBuilder
 	// WithStatusRequest adds StatusRequest (property field)
 	WithStatusRequest(StatusRequest) CBusPointToPointToMultiPointCommandStatusBuilder
-	// WithStatusRequestBuilder adds StatusRequest (property field) which is build by the builder
-	WithStatusRequestBuilder(func(StatusRequestBuilder) StatusRequestBuilder) CBusPointToPointToMultiPointCommandStatusBuilder
 	// Build builds the CBusPointToPointToMultiPointCommandStatus or returns an error if something is wrong
 	Build() (CBusPointToPointToMultiPointCommandStatus, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_CBusPointToPointToMultiPointCommandStatusBuilder) WithStatusRequest(st
 	return m
 }
 
-func (m *_CBusPointToPointToMultiPointCommandStatusBuilder) WithStatusRequestBuilder(builderSupplier func(StatusRequestBuilder) StatusRequestBuilder) CBusPointToPointToMultiPointCommandStatusBuilder {
-	builder := builderSupplier(m.StatusRequest.CreateStatusRequestBuilder())
-	var err error
-	m.StatusRequest, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "StatusRequestBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CBusPointToPointToMultiPointCommandStatusBuilder) Build() (CBusPointToPointToMultiPointCommandStatus, error) {
 	if m.StatusRequest == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go b/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
index f87c788fcda..9f0ccfc6b02 100644
--- a/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/ChannelStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Checksum.go b/plc4go/protocols/cbus/readwrite/model/Checksum.go
index 11ddde0ed1e..beab9a6b1ff 100644
--- a/plc4go/protocols/cbus/readwrite/model/Checksum.go
+++ b/plc4go/protocols/cbus/readwrite/model/Checksum.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
index 6731287cfe1..c049acdd4ff 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
index ecb1ef62317..8aaad66e152 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
index 37fe14ef78b..97c9189dc07 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataRequestRefresh.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataRequestRefresh.go
index 7b01bf25984..83839adc38e 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataRequestRefresh.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataRequestRefresh.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateDate.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateDate.go
index 7e1ffa08456..77a3bbc607f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateDate.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateDate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateTime.go b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateTime.go
index 40858938dfd..2996d34c2ae 100644
--- a/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateTime.go
+++ b/plc4go/protocols/cbus/readwrite/model/ClockAndTimekeepingDataUpdateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Confirmation.go b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
index 759423e85a1..6a0ffaae250 100644
--- a/plc4go/protocols/cbus/readwrite/model/Confirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/Confirmation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go b/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
index 3383aa0270c..9cd299fb132 100644
--- a/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ConfirmationType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go b/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
index 448e6438299..1fec831b928 100644
--- a/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CustomManufacturer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/CustomTypes.go b/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
index 59c255fd1a5..c14f90c859a 100644
--- a/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
+++ b/plc4go/protocols/cbus/readwrite/model/CustomTypes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go b/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
index a87e68fabea..8da0e3387bd 100644
--- a/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
+++ b/plc4go/protocols/cbus/readwrite/model/DestinationAddressType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go b/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
index 14f2f4e91eb..29a5dd377a1 100644
--- a/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/DialInFailureReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go b/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
index f9e9f16d025..e145a2412b4 100644
--- a/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/DialOutFailureReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
index 195a8f4234c..838899eb37a 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
index b60cb5026f4..bb37f67cad4 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/EnableControlData.go b/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
index bef17f32161..a35b1af04fa 100644
--- a/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/EnableControlData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
index 18a96487553..d6d888ba816 100644
--- a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go b/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
index 8fcbd071541..cf7236b6acc 100644
--- a/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/EncodedReplyCALReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type EncodedReplyCALReplyBuilder interface {
 	WithMandatoryFields(calReply CALReply) EncodedReplyCALReplyBuilder
 	// WithCalReply adds CalReply (property field)
 	WithCalReply(CALReply) EncodedReplyCALReplyBuilder
-	// WithCalReplyBuilder adds CalReply (property field) which is build by the builder
-	WithCalReplyBuilder(func(CALReplyBuilder) CALReplyBuilder) EncodedReplyCALReplyBuilder
 	// Build builds the EncodedReplyCALReply or returns an error if something is wrong
 	Build() (EncodedReplyCALReply, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_EncodedReplyCALReplyBuilder) WithCalReply(calReply CALReply) EncodedRe
 	return m
 }
 
-func (m *_EncodedReplyCALReplyBuilder) WithCalReplyBuilder(builderSupplier func(CALReplyBuilder) CALReplyBuilder) EncodedReplyCALReplyBuilder {
-	builder := builderSupplier(m.CalReply.CreateCALReplyBuilder())
-	var err error
-	m.CalReply, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALReplyBuilder failed"))
-	}
-	return m
-}
-
 func (m *_EncodedReplyCALReplyBuilder) Build() (EncodedReplyCALReply, error) {
 	if m.CalReply == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
index 53a90707530..3000f3d0cb6 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
index 531f0a48b3c..a619b08219b 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
index a7a8f1aec18..7e8d7c6476b 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingDataGeneric.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingDataGeneric.go
index 8a0d760f9cc..c15093859ec 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingDataGeneric.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingDataGeneric.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
index 2fd73669141..2413606c80d 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSeverity.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
index 1c2b45a18e8..a77f10fb3d5 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategory.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type ErrorReportingSystemCategoryBuilder interface {
 	WithSystemCategoryClass(ErrorReportingSystemCategoryClass) ErrorReportingSystemCategoryBuilder
 	// WithSystemCategoryType adds SystemCategoryType (property field)
 	WithSystemCategoryType(ErrorReportingSystemCategoryType) ErrorReportingSystemCategoryBuilder
-	// WithSystemCategoryTypeBuilder adds SystemCategoryType (property field) which is build by the builder
-	WithSystemCategoryTypeBuilder(func(ErrorReportingSystemCategoryTypeBuilder) ErrorReportingSystemCategoryTypeBuilder) ErrorReportingSystemCategoryBuilder
 	// WithSystemCategoryVariant adds SystemCategoryVariant (property field)
 	WithSystemCategoryVariant(ErrorReportingSystemCategoryVariant) ErrorReportingSystemCategoryBuilder
 	// Build builds the ErrorReportingSystemCategory or returns an error if something is wrong
@@ -117,19 +117,6 @@ func (m *_ErrorReportingSystemCategoryBuilder) WithSystemCategoryType(systemCate
 	return m
 }
 
-func (m *_ErrorReportingSystemCategoryBuilder) WithSystemCategoryTypeBuilder(builderSupplier func(ErrorReportingSystemCategoryTypeBuilder) ErrorReportingSystemCategoryTypeBuilder) ErrorReportingSystemCategoryBuilder {
-	builder := builderSupplier(m.SystemCategoryType.CreateErrorReportingSystemCategoryTypeBuilder())
-	var err error
-	m.SystemCategoryType, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ErrorReportingSystemCategoryTypeBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ErrorReportingSystemCategoryBuilder) WithSystemCategoryVariant(systemCategoryVariant ErrorReportingSystemCategoryVariant) ErrorReportingSystemCategoryBuilder {
 	m.SystemCategoryVariant = systemCategoryVariant
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
index 96b1da2dfa6..3bfea9f0189 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
index bd398d806b1..8410fee5a0c 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeBuildingManagementSystems.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeBuildingManagementSystems.go
index a6c7cedb62f..cd0a726fab0 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeBuildingManagementSystems.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeBuildingManagementSystems.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeClimateControllers.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeClimateControllers.go
index ef80998f76d..382cd763c6b 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeClimateControllers.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeClimateControllers.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
index 2f874c7d148..85fc1a81288 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForBuildingManagementSystems.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
index d4ee98001b3..f197f76372f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForClimateControllers.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
index 469233d5c56..d2c6cb406eb 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForInputUnits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
index b0e7c89f281..46983621c2e 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForOutputUnits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
index 6f18cefe8ca..4b2172cb58f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeForSupportUnits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeInputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeInputUnits.go
index 7e033ebd1d0..fa70b775e9e 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeInputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeInputUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeOutputUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeOutputUnits.go
index 1ac085ec008..89af5dd7561 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeOutputUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeOutputUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeReserved.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeReserved.go
index 81c9cb21a23..13b8a621315 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeReserved.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeReserved.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeSupportUnits.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeSupportUnits.go
index 65793a96ab3..c4c16e0cd58 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeSupportUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryTypeSupportUnits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
index 1b54245a6e7..1237401108c 100644
--- a/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
+++ b/plc4go/protocols/cbus/readwrite/model/ErrorReportingSystemCategoryVariant.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/GAVState.go b/plc4go/protocols/cbus/readwrite/model/GAVState.go
index 6b4d844738e..ab9f9acd626 100644
--- a/plc4go/protocols/cbus/readwrite/model/GAVState.go
+++ b/plc4go/protocols/cbus/readwrite/model/GAVState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
index 30c5bad1299..7f3afc6cb56 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACAuxiliaryLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACError.go b/plc4go/protocols/cbus/readwrite/model/HVACError.go
index d1bd3cf3888..eb862d9f55c 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACError.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACError.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
index b8905cdd25d..75db2bb1ea2 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidity.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
index b12b6654129..173547d8b94 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityError.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
index b38e9ed89f1..62b5768fb92 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
index 2c032985dc7..e08105ba5eb 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityModeAndFlagsMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
index 9fbc4e6098b..eb16afb1f5b 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go b/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
index 8f27b6b6e99..1e662f70fb5 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACHumidityType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
index ceba2b7d07a..a5a60c0504b 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
index 0fbdeb7c8fd..bc087104232 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACModeAndFlagsMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go b/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
index ed5d872a1a2..9ecd9685d1c 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACRawLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go b/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
index a6b0eceed8b..de68ea83e36 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACSensorStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go b/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
index f3e4fe4f032..443e34c3cb3 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACStartTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
index f820fd7ecd5..470bb155d48 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACStatusFlags.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go b/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
index a2c2ae67a2f..2a28ec7a794 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACTemperature.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACType.go b/plc4go/protocols/cbus/readwrite/model/HVACType.go
index 1ac39e981a0..b4dd20bec0a 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACType.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go b/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
index 283fa1c7801..99eab6fb01c 100644
--- a/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
+++ b/plc4go/protocols/cbus/readwrite/model/HVACZoneList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
index a90848f359d..bfe85be350b 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommand.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
index 4313ccad6b6..4c338734216 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
index 6455681dd69..a658d3e73c1 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
index e7e41d0f6a5..9c982aa96e5 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandDelays.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
index 7eaa4b2fb3d..61e598b512b 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
index 591035f5c0e..84ff27d9dc8 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
index a2b616765a3..293d0d9e5c2 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
index 71c26e913ba..80136ecdcae 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
index b22bd38c168..7ecac8e9bdf 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
index 9ec128933ae..2f01cf98540 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
index 01bc13729ea..b47db2c785c 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
index 272d1295ecc..ad2f8397706 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
index 3b1a6808283..b6e3e531cbe 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
index 377bb270467..1bb52cc16b9 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
index a65ad7e5df3..6429664bc39 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
index 1c69fca907b..0c72069c5a9 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
index 62b267889a5..20ed1b26289 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
index 1f5851223e1..545b9544af6 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
index 35b5147866d..74166a8ae18 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
index 53eac69a8fc..8459a1ef67d 100644
--- a/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
+++ b/plc4go/protocols/cbus/readwrite/model/IdentifyReplyCommandUnitSummary.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
index 109c7e85985..dbf4bfaf0c2 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
index 9e7e749f34b..4955bbd5557 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions1PowerUpSettings.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
index e178d9c11d8..0c7982118e4 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
index 9cf2bdcf8c8..cb250f346a0 100644
--- a/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
+++ b/plc4go/protocols/cbus/readwrite/model/InterfaceOptions3.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Language.go b/plc4go/protocols/cbus/readwrite/model/Language.go
index 239c2e09399..2fe78b6ab15 100644
--- a/plc4go/protocols/cbus/readwrite/model/Language.go
+++ b/plc4go/protocols/cbus/readwrite/model/Language.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
index aec90e38a17..231544b001c 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
index 31df3c632f1..8c70d0ff762 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationAbsent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationCorrupted.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationCorrupted.go
index e30079f9eef..e5a8bc565b7 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationCorrupted.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationCorrupted.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
index d6d4f04aa5c..195472859c2 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationNibblePair.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformationNormal.go b/plc4go/protocols/cbus/readwrite/model/LevelInformationNormal.go
index e7aff7ffa00..c8a16165585 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformationNormal.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformationNormal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go b/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
index 498920ccc1b..6951cdc4a08 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
index 8fe3b3dbb5f..b4dc8931d80 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go b/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
index e573a054c7e..d7927783149 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingCompatible.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingData.go b/plc4go/protocols/cbus/readwrite/model/LightingData.go
index 5b885038730..7a6b2787b09 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingData.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingDataLabel.go b/plc4go/protocols/cbus/readwrite/model/LightingDataLabel.go
index 1100a9ed164..47615f8c56f 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingDataLabel.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingDataLabel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingDataOff.go b/plc4go/protocols/cbus/readwrite/model/LightingDataOff.go
index 032a4409632..346a04fae14 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingDataOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingDataOff.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingDataOn.go b/plc4go/protocols/cbus/readwrite/model/LightingDataOn.go
index d7ba1f8df0b..dac95ff023d 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingDataOn.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingDataOn.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingDataRampToLevel.go b/plc4go/protocols/cbus/readwrite/model/LightingDataRampToLevel.go
index 28c0ea61ed8..60b4ef17504 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingDataRampToLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingDataRampToLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingDataTerminateRamp.go b/plc4go/protocols/cbus/readwrite/model/LightingDataTerminateRamp.go
index 4ad8d9c1551..fcc2f9e9a4e 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingDataTerminateRamp.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingDataTerminateRamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
index 1228b1336f8..af4fc9c87ae 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelFlavour.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
index 8a5abb023d4..4d4a420428f 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelOptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go b/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
index 7446d6b4fa2..23dd56cffc6 100644
--- a/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
+++ b/plc4go/protocols/cbus/readwrite/model/LightingLabelType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go b/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
index c28fc7e75b8..5d00c055d0a 100644
--- a/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
+++ b/plc4go/protocols/cbus/readwrite/model/LineOffHookReason.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
index 92f295fa9b7..ec4eb47b463 100644
--- a/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
+++ b/plc4go/protocols/cbus/readwrite/model/LogicAssignment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
index 5da1efc34d5..cfc791d1972 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
index b258b1905f2..4f60fa6fc0a 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementData.go b/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
index 47c0e20fc91..779efb4cd53 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementDataChannelMeasurementData.go b/plc4go/protocols/cbus/readwrite/model/MeasurementDataChannelMeasurementData.go
index f6a3f1401a8..8c1b0b8712e 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementDataChannelMeasurementData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementDataChannelMeasurementData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go b/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
index 31d3d1763f7..c4e10bc4490 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeasurementUnits.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
index e1d5940d950..b4343283a09 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
index 3ebefc9e4e6..86439a637bb 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
index 1bcd22c0d4e..5fdaf390d44 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataCategoryName.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataCategoryName.go
index 86661b071ed..79169813676 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataCategoryName.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataCategoryName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerateCategoriesSelectionTracks.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerateCategoriesSelectionTracks.go
index 650a168c03c..56d6e57044d 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerateCategoriesSelectionTracks.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerateCategoriesSelectionTracks.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerationsSize.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerationsSize.go
index ff5f2b78f8f..8f63d203eff 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerationsSize.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataEnumerationsSize.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataFastForward.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataFastForward.go
index 3fb53d1e73b..2a9c703647b 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataFastForward.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataFastForward.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousCategory.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousCategory.go
index 443f37be42c..8bdd130672d 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousCategory.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousSelection.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousSelection.go
index 31454ce9b27..e0e6ba3e987 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousSelection.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousSelection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousTrack.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousTrack.go
index 763a579d303..0fe57d99fe7 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousTrack.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataNextPreviousTrack.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPauseResume.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPauseResume.go
index f7496118784..1c93958f883 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPauseResume.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPauseResume.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPlay.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPlay.go
index 0ef7d4d3179..e0569abe8ea 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPlay.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataPlay.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRepeatOnOff.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRepeatOnOff.go
index 2664771ec14..61803557928 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRepeatOnOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRepeatOnOff.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRewind.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRewind.go
index b0739f3c425..18d34fb30ec 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRewind.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataRewind.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSelectionName.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSelectionName.go
index 6670d61a62c..b06ad1e14a9 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSelectionName.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSelectionName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetCategory.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetCategory.go
index 60d1977e86d..30ddc693355 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetCategory.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetCategory.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetSelection.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetSelection.go
index f36bfa388a8..5ddc1c7d853 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetSelection.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetSelection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetTrack.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetTrack.go
index d3bc389c48d..39b74debf87 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetTrack.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSetTrack.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataShuffleOnOff.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataShuffleOnOff.go
index 0f87dd6beb2..3d9e943162e 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataShuffleOnOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataShuffleOnOff.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSourcePowerControl.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSourcePowerControl.go
index 1a6b781bd60..d1597518fbb 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSourcePowerControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataSourcePowerControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStatusRequest.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStatusRequest.go
index 43e87d5d35e..640eb720200 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStatusRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStatusRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStop.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStop.go
index 71bf60bd26d..398d73b6b29 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStop.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataStop.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTotalTracks.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTotalTracks.go
index e5056fbdeb2..8caad9ce3fd 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTotalTracks.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTotalTracks.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTrackName.go b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTrackName.go
index ac8b4dc10f4..3f075a630be 100644
--- a/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTrackName.go
+++ b/plc4go/protocols/cbus/readwrite/model/MediaTransportControlDataTrackName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go b/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
index dfe470f9b8e..2f49156ba41 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
index 0df93108711..20031ac48d1 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringData.go b/plc4go/protocols/cbus/readwrite/model/MeteringData.go
index 18781916a13..17c82cb6ecf 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringData.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataDrinkingWaterConsumption.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataDrinkingWaterConsumption.go
index 8acb5589fcd..f00aca2cf7b 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataDrinkingWaterConsumption.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataDrinkingWaterConsumption.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataElectricityConsumption.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataElectricityConsumption.go
index 6d1e6ef7a6f..aacf3a38cdd 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataElectricityConsumption.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataElectricityConsumption.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataGasConsumption.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataGasConsumption.go
index 6c94842437d..5e4c2b3d515 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataGasConsumption.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataGasConsumption.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureDrinkingWater.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureDrinkingWater.go
index b7e111fbef5..b5bc5564815 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureDrinkingWater.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureDrinkingWater.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureElectricity.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureElectricity.go
index cd3502969f5..bb78f9c7d66 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureElectricity.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureElectricity.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureGas.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureGas.go
index fb27712febb..ffc07c7333a 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureGas.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureGas.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOil.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOil.go
index ade38316ba1..c6cdda91ace 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOil.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOil.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOtherWater.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOtherWater.go
index 54ef3fe3382..fd68735d004 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOtherWater.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataMeasureOtherWater.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataOilConsumption.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataOilConsumption.go
index 6c4f289bddc..cda375a5be9 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataOilConsumption.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataOilConsumption.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MeteringDataOtherWaterConsumption.go b/plc4go/protocols/cbus/readwrite/model/MeteringDataOtherWaterConsumption.go
index f2284817705..637e0678108 100644
--- a/plc4go/protocols/cbus/readwrite/model/MeteringDataOtherWaterConsumption.go
+++ b/plc4go/protocols/cbus/readwrite/model/MeteringDataOtherWaterConsumption.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
index 456f0297406..82698459100 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
index 446ce487afc..83b34857810 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -123,8 +125,6 @@ type MonitoredSALLongFormSmartModeBuilder interface {
 	WithOptionalReplyNetworkBuilder(func(ReplyNetworkBuilder) ReplyNetworkBuilder) MonitoredSALLongFormSmartModeBuilder
 	// WithSalData adds SalData (property field)
 	WithOptionalSalData(SALData) MonitoredSALLongFormSmartModeBuilder
-	// WithOptionalSalDataBuilder adds SalData (property field) which is build by the builder
-	WithOptionalSalDataBuilder(func(SALDataBuilder) SALDataBuilder) MonitoredSALLongFormSmartModeBuilder
 	// Build builds the MonitoredSALLongFormSmartMode or returns an error if something is wrong
 	Build() (MonitoredSALLongFormSmartMode, error)
 	// MustBuild does the same as Build but panics on error
@@ -222,19 +222,6 @@ func (m *_MonitoredSALLongFormSmartModeBuilder) WithOptionalSalData(salData SALD
 	return m
 }
 
-func (m *_MonitoredSALLongFormSmartModeBuilder) WithOptionalSalDataBuilder(builderSupplier func(SALDataBuilder) SALDataBuilder) MonitoredSALLongFormSmartModeBuilder {
-	builder := builderSupplier(m.SalData.CreateSALDataBuilder())
-	var err error
-	m.SalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredSALLongFormSmartModeBuilder) Build() (MonitoredSALLongFormSmartMode, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
index 03c33abe7d5..9b65c8c6c83 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type MonitoredSALReplyBuilder interface {
 	WithMandatoryFields(monitoredSAL MonitoredSAL) MonitoredSALReplyBuilder
 	// WithMonitoredSAL adds MonitoredSAL (property field)
 	WithMonitoredSAL(MonitoredSAL) MonitoredSALReplyBuilder
-	// WithMonitoredSALBuilder adds MonitoredSAL (property field) which is build by the builder
-	WithMonitoredSALBuilder(func(MonitoredSALBuilder) MonitoredSALBuilder) MonitoredSALReplyBuilder
 	// Build builds the MonitoredSALReply or returns an error if something is wrong
 	Build() (MonitoredSALReply, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_MonitoredSALReplyBuilder) WithMonitoredSAL(monitoredSAL MonitoredSAL)
 	return m
 }
 
-func (m *_MonitoredSALReplyBuilder) WithMonitoredSALBuilder(builderSupplier func(MonitoredSALBuilder) MonitoredSALBuilder) MonitoredSALReplyBuilder {
-	builder := builderSupplier(m.MonitoredSAL.CreateMonitoredSALBuilder())
-	var err error
-	m.MonitoredSAL, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "MonitoredSALBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredSALReplyBuilder) Build() (MonitoredSALReply, error) {
 	if m.MonitoredSAL == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
index fa26d6a0fd0..c608fa940db 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,8 +109,6 @@ type MonitoredSALShortFormBasicModeBuilder interface {
 	WithApplication(ApplicationIdContainer) MonitoredSALShortFormBasicModeBuilder
 	// WithSalData adds SalData (property field)
 	WithOptionalSalData(SALData) MonitoredSALShortFormBasicModeBuilder
-	// WithOptionalSalDataBuilder adds SalData (property field) which is build by the builder
-	WithOptionalSalDataBuilder(func(SALDataBuilder) SALDataBuilder) MonitoredSALShortFormBasicModeBuilder
 	// Build builds the MonitoredSALShortFormBasicMode or returns an error if something is wrong
 	Build() (MonitoredSALShortFormBasicMode, error)
 	// MustBuild does the same as Build but panics on error
@@ -162,19 +162,6 @@ func (m *_MonitoredSALShortFormBasicModeBuilder) WithOptionalSalData(salData SAL
 	return m
 }
 
-func (m *_MonitoredSALShortFormBasicModeBuilder) WithOptionalSalDataBuilder(builderSupplier func(SALDataBuilder) SALDataBuilder) MonitoredSALShortFormBasicModeBuilder {
-	builder := builderSupplier(m.SalData.CreateSALDataBuilder())
-	var err error
-	m.SalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredSALShortFormBasicModeBuilder) Build() (MonitoredSALShortFormBasicMode, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
index c6a7f75b6c0..0a67b33709e 100644
--- a/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/NetworkProtocolControlInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go b/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
index 6cbed84785f..12dfa903337 100644
--- a/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
+++ b/plc4go/protocols/cbus/readwrite/model/NetworkRoute.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/PanicStatus.go b/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
index 642b17017b4..b1912169c16 100644
--- a/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/PanicStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Parameter.go b/plc4go/protocols/cbus/readwrite/model/Parameter.go
index b525c997397..6ed30a74f72 100644
--- a/plc4go/protocols/cbus/readwrite/model/Parameter.go
+++ b/plc4go/protocols/cbus/readwrite/model/Parameter.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterChange.go b/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
index c614d1cef67..624c64acbd0 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterChange.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go b/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
index f0a9489f0f0..757675947ed 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterChangeReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterType.go b/plc4go/protocols/cbus/readwrite/model/ParameterType.go
index f6a4ee8c40b..42859b65055 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterType.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValue.go b/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
index 619039c4677..cc0d10e9d6a 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValue.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
index 97b0362f7a3..32b41a78975 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
index 887a164e891..099c844fddc 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueApplicationAddress2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
index 1dbaffdf0af..b8b44e139d9 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueBaudRateSelector.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
index 1acf2a5e08c..56e414c894f 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomManufacturer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
index e95e1d0eba8..ec380f934c3 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueCustomTypes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
index e7992d29a58..0844c6daf78 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
index 304cc6fe3b8..5f3d563c684 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions1PowerUpSettings.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
index 142a0db5dbc..7e57235a786 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
index c2ec4977d70..1dde63e9620 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueInterfaceOptions3.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
index 8078f57d144..6ae4d273f9a 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueRaw.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go b/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
index 8466f1cea2a..cdd4f5ad2f6 100644
--- a/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
+++ b/plc4go/protocols/cbus/readwrite/model/ParameterValueSerialNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/PowerUp.go b/plc4go/protocols/cbus/readwrite/model/PowerUp.go
index c05b193b493..02b2fb9e895 100644
--- a/plc4go/protocols/cbus/readwrite/model/PowerUp.go
+++ b/plc4go/protocols/cbus/readwrite/model/PowerUp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go b/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
index 91dfd8684d7..f40f8a0d275 100644
--- a/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/PowerUpReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/PriorityClass.go b/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
index 72a8001defd..cce1ffaf739 100644
--- a/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
+++ b/plc4go/protocols/cbus/readwrite/model/PriorityClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go b/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
index b70fe75e4d9..ba58a49f11e 100644
--- a/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/ProtectionLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/Reply.go b/plc4go/protocols/cbus/readwrite/model/Reply.go
index d2b29445fbe..fcb4e1b1307 100644
--- a/plc4go/protocols/cbus/readwrite/model/Reply.go
+++ b/plc4go/protocols/cbus/readwrite/model/Reply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go b/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
index 04893058f91..bda468b5152 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
@@ -22,10 +22,12 @@ package model
 import (
 	"context"
 	"fmt"
-	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -84,8 +86,6 @@ type ReplyEncodedReplyBuilder interface {
 	WithMandatoryFields(encodedReply EncodedReply, chksum Checksum) ReplyEncodedReplyBuilder
 	// WithEncodedReply adds EncodedReply (property field)
 	WithEncodedReply(EncodedReply) ReplyEncodedReplyBuilder
-	// WithEncodedReplyBuilder adds EncodedReply (property field) which is build by the builder
-	WithEncodedReplyBuilder(func(EncodedReplyBuilder) EncodedReplyBuilder) ReplyEncodedReplyBuilder
 	// WithChksum adds Chksum (property field)
 	WithChksum(Checksum) ReplyEncodedReplyBuilder
 	// WithChksumBuilder adds Chksum (property field) which is build by the builder
@@ -118,19 +118,6 @@ func (m *_ReplyEncodedReplyBuilder) WithEncodedReply(encodedReply EncodedReply)
 	return m
 }
 
-func (m *_ReplyEncodedReplyBuilder) WithEncodedReplyBuilder(builderSupplier func(EncodedReplyBuilder) EncodedReplyBuilder) ReplyEncodedReplyBuilder {
-	builder := builderSupplier(m.EncodedReply.CreateEncodedReplyBuilder())
-	var err error
-	m.EncodedReply, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "EncodedReplyBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ReplyEncodedReplyBuilder) WithChksum(chksum Checksum) ReplyEncodedReplyBuilder {
 	m.Chksum = chksum
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go b/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
index 48491978f6a..1a8f6afea87 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
index c57464128fc..1a5e33578ac 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
index af265c0ad26..b80d2ae19d7 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationConfirmation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type ReplyOrConfirmationConfirmationBuilder interface {
 	WithConfirmationBuilder(func(ConfirmationBuilder) ConfirmationBuilder) ReplyOrConfirmationConfirmationBuilder
 	// WithEmbeddedReply adds EmbeddedReply (property field)
 	WithOptionalEmbeddedReply(ReplyOrConfirmation) ReplyOrConfirmationConfirmationBuilder
-	// WithOptionalEmbeddedReplyBuilder adds EmbeddedReply (property field) which is build by the builder
-	WithOptionalEmbeddedReplyBuilder(func(ReplyOrConfirmationBuilder) ReplyOrConfirmationBuilder) ReplyOrConfirmationConfirmationBuilder
 	// Build builds the ReplyOrConfirmationConfirmation or returns an error if something is wrong
 	Build() (ReplyOrConfirmationConfirmation, error)
 	// MustBuild does the same as Build but panics on error
@@ -136,19 +136,6 @@ func (m *_ReplyOrConfirmationConfirmationBuilder) WithOptionalEmbeddedReply(embe
 	return m
 }
 
-func (m *_ReplyOrConfirmationConfirmationBuilder) WithOptionalEmbeddedReplyBuilder(builderSupplier func(ReplyOrConfirmationBuilder) ReplyOrConfirmationBuilder) ReplyOrConfirmationConfirmationBuilder {
-	builder := builderSupplier(m.EmbeddedReply.CreateReplyOrConfirmationBuilder())
-	var err error
-	m.EmbeddedReply, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ReplyOrConfirmationBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ReplyOrConfirmationConfirmationBuilder) Build() (ReplyOrConfirmationConfirmation, error) {
 	if m.Confirmation == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
index 5d9ff7af70f..3d8d9b87542 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmationReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -87,8 +89,6 @@ type ReplyOrConfirmationReplyBuilder interface {
 	WithMandatoryFields(reply Reply, termination ResponseTermination) ReplyOrConfirmationReplyBuilder
 	// WithReply adds Reply (property field)
 	WithReply(Reply) ReplyOrConfirmationReplyBuilder
-	// WithReplyBuilder adds Reply (property field) which is build by the builder
-	WithReplyBuilder(func(ReplyBuilder) ReplyBuilder) ReplyOrConfirmationReplyBuilder
 	// WithTermination adds Termination (property field)
 	WithTermination(ResponseTermination) ReplyOrConfirmationReplyBuilder
 	// WithTerminationBuilder adds Termination (property field) which is build by the builder
@@ -121,19 +121,6 @@ func (m *_ReplyOrConfirmationReplyBuilder) WithReply(reply Reply) ReplyOrConfirm
 	return m
 }
 
-func (m *_ReplyOrConfirmationReplyBuilder) WithReplyBuilder(builderSupplier func(ReplyBuilder) ReplyBuilder) ReplyOrConfirmationReplyBuilder {
-	builder := builderSupplier(m.Reply.CreateReplyBuilder())
-	var err error
-	m.Reply, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ReplyBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ReplyOrConfirmationReplyBuilder) WithTermination(termination ResponseTermination) ReplyOrConfirmationReplyBuilder {
 	m.Termination = termination
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/Request.go b/plc4go/protocols/cbus/readwrite/model/Request.go
index c79da441b4e..6985c4bab44 100644
--- a/plc4go/protocols/cbus/readwrite/model/Request.go
+++ b/plc4go/protocols/cbus/readwrite/model/Request.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
index 1c7cb8a767a..0746f23a83e 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type RequestCommandBuilder interface {
 	WithMandatoryFields(cbusCommand CBusCommand, chksum Checksum) RequestCommandBuilder
 	// WithCbusCommand adds CbusCommand (property field)
 	WithCbusCommand(CBusCommand) RequestCommandBuilder
-	// WithCbusCommandBuilder adds CbusCommand (property field) which is build by the builder
-	WithCbusCommandBuilder(func(CBusCommandBuilder) CBusCommandBuilder) RequestCommandBuilder
 	// WithChksum adds Chksum (property field)
 	WithChksum(Checksum) RequestCommandBuilder
 	// WithChksumBuilder adds Chksum (property field) which is build by the builder
@@ -130,19 +130,6 @@ func (m *_RequestCommandBuilder) WithCbusCommand(cbusCommand CBusCommand) Reques
 	return m
 }
 
-func (m *_RequestCommandBuilder) WithCbusCommandBuilder(builderSupplier func(CBusCommandBuilder) CBusCommandBuilder) RequestCommandBuilder {
-	builder := builderSupplier(m.CbusCommand.CreateCBusCommandBuilder())
-	var err error
-	m.CbusCommand, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CBusCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RequestCommandBuilder) WithChksum(chksum Checksum) RequestCommandBuilder {
 	m.Chksum = chksum
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestContext.go b/plc4go/protocols/cbus/readwrite/model/RequestContext.go
index ad637176678..1714dca23b3 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestContext.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestContext.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
index faf1b412aa4..cf2018fb955 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type RequestDirectCommandAccessBuilder interface {
 	WithMandatoryFields(calData CALData) RequestDirectCommandAccessBuilder
 	// WithCalData adds CalData (property field)
 	WithCalData(CALData) RequestDirectCommandAccessBuilder
-	// WithCalDataBuilder adds CalData (property field) which is build by the builder
-	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) RequestDirectCommandAccessBuilder
 	// WithAlpha adds Alpha (property field)
 	WithOptionalAlpha(Alpha) RequestDirectCommandAccessBuilder
 	// WithOptionalAlphaBuilder adds Alpha (property field) which is build by the builder
@@ -120,19 +120,6 @@ func (m *_RequestDirectCommandAccessBuilder) WithCalData(calData CALData) Reques
 	return m
 }
 
-func (m *_RequestDirectCommandAccessBuilder) WithCalDataBuilder(builderSupplier func(CALDataBuilder) CALDataBuilder) RequestDirectCommandAccessBuilder {
-	builder := builderSupplier(m.CalData.CreateCALDataBuilder())
-	var err error
-	m.CalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RequestDirectCommandAccessBuilder) WithOptionalAlpha(alpha Alpha) RequestDirectCommandAccessBuilder {
 	m.Alpha = alpha
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go b/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
index a9bb84fbcb1..0241cee9d77 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestEmpty.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestNull.go b/plc4go/protocols/cbus/readwrite/model/RequestNull.go
index 48f39cff1b6..04ca5f13379 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestNull.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestNull.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
index 29167ffafca..70c781509e6 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -83,8 +85,6 @@ type RequestObsoleteBuilder interface {
 	WithMandatoryFields(calData CALData) RequestObsoleteBuilder
 	// WithCalData adds CalData (property field)
 	WithCalData(CALData) RequestObsoleteBuilder
-	// WithCalDataBuilder adds CalData (property field) which is build by the builder
-	WithCalDataBuilder(func(CALDataBuilder) CALDataBuilder) RequestObsoleteBuilder
 	// WithAlpha adds Alpha (property field)
 	WithOptionalAlpha(Alpha) RequestObsoleteBuilder
 	// WithOptionalAlphaBuilder adds Alpha (property field) which is build by the builder
@@ -117,19 +117,6 @@ func (m *_RequestObsoleteBuilder) WithCalData(calData CALData) RequestObsoleteBu
 	return m
 }
 
-func (m *_RequestObsoleteBuilder) WithCalDataBuilder(builderSupplier func(CALDataBuilder) CALDataBuilder) RequestObsoleteBuilder {
-	builder := builderSupplier(m.CalData.CreateCALDataBuilder())
-	var err error
-	m.CalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RequestObsoleteBuilder) WithOptionalAlpha(alpha Alpha) RequestObsoleteBuilder {
 	m.Alpha = alpha
 	return m
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestReset.go b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
index 140e0f8f7ef..4b8d234aac5 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestReset.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
index bd2da87baf8..2faaba9973e 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestTermination.go b/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
index d5ae208d5ee..81d0c428e6b 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestTermination.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestType.go b/plc4go/protocols/cbus/readwrite/model/RequestType.go
index 48053047039..bb9f91315bd 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestType.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go b/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
index 8233326e53e..7e332e14f38 100644
--- a/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
+++ b/plc4go/protocols/cbus/readwrite/model/ResponseTermination.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALData.go b/plc4go/protocols/cbus/readwrite/model/SALData.go
index 3711c181fc1..d616ad522be 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALData.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type SALDataBuilder interface {
 	WithMandatoryFields() SALDataBuilder
 	// WithSalData adds SalData (property field)
 	WithOptionalSalData(SALData) SALDataBuilder
-	// WithOptionalSalDataBuilder adds SalData (property field) which is build by the builder
-	WithOptionalSalDataBuilder(func(SALDataBuilder) SALDataBuilder) SALDataBuilder
 	// Build builds the SALData or returns an error if something is wrong
 	Build() (SALDataContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -118,19 +118,6 @@ func (m *_SALDataBuilder) WithOptionalSalData(salData SALData) SALDataBuilder {
 	return m
 }
 
-func (m *_SALDataBuilder) WithOptionalSalDataBuilder(builderSupplier func(SALDataBuilder) SALDataBuilder) SALDataBuilder {
-	builder := builderSupplier(m.SalData.CreateSALDataBuilder())
-	var err error
-	m.SalData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SALDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataBuilder) Build() (SALDataContract, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataAccessControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataAccessControl.go
index bab80887d0d..652f9ea2a46 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataAccessControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataAccessControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataAccessControlBuilder interface {
 	WithMandatoryFields(accessControlData AccessControlData) SALDataAccessControlBuilder
 	// WithAccessControlData adds AccessControlData (property field)
 	WithAccessControlData(AccessControlData) SALDataAccessControlBuilder
-	// WithAccessControlDataBuilder adds AccessControlData (property field) which is build by the builder
-	WithAccessControlDataBuilder(func(AccessControlDataBuilder) AccessControlDataBuilder) SALDataAccessControlBuilder
 	// Build builds the SALDataAccessControl or returns an error if something is wrong
 	Build() (SALDataAccessControl, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataAccessControlBuilder) WithAccessControlData(accessControlData A
 	return m
 }
 
-func (m *_SALDataAccessControlBuilder) WithAccessControlDataBuilder(builderSupplier func(AccessControlDataBuilder) AccessControlDataBuilder) SALDataAccessControlBuilder {
-	builder := builderSupplier(m.AccessControlData.CreateAccessControlDataBuilder())
-	var err error
-	m.AccessControlData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "AccessControlDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataAccessControlBuilder) Build() (SALDataAccessControl, error) {
 	if m.AccessControlData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataAirConditioning.go b/plc4go/protocols/cbus/readwrite/model/SALDataAirConditioning.go
index 74c000f3e3b..302ed845211 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataAirConditioning.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataAirConditioning.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataAirConditioningBuilder interface {
 	WithMandatoryFields(airConditioningData AirConditioningData) SALDataAirConditioningBuilder
 	// WithAirConditioningData adds AirConditioningData (property field)
 	WithAirConditioningData(AirConditioningData) SALDataAirConditioningBuilder
-	// WithAirConditioningDataBuilder adds AirConditioningData (property field) which is build by the builder
-	WithAirConditioningDataBuilder(func(AirConditioningDataBuilder) AirConditioningDataBuilder) SALDataAirConditioningBuilder
 	// Build builds the SALDataAirConditioning or returns an error if something is wrong
 	Build() (SALDataAirConditioning, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataAirConditioningBuilder) WithAirConditioningData(airConditioning
 	return m
 }
 
-func (m *_SALDataAirConditioningBuilder) WithAirConditioningDataBuilder(builderSupplier func(AirConditioningDataBuilder) AirConditioningDataBuilder) SALDataAirConditioningBuilder {
-	builder := builderSupplier(m.AirConditioningData.CreateAirConditioningDataBuilder())
-	var err error
-	m.AirConditioningData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "AirConditioningDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataAirConditioningBuilder) Build() (SALDataAirConditioning, error) {
 	if m.AirConditioningData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataAudioAndVideo.go b/plc4go/protocols/cbus/readwrite/model/SALDataAudioAndVideo.go
index ba754b8ee1f..8b85ce861ee 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataAudioAndVideo.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataAudioAndVideo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataAudioAndVideoBuilder interface {
 	WithMandatoryFields(audioVideoData LightingData) SALDataAudioAndVideoBuilder
 	// WithAudioVideoData adds AudioVideoData (property field)
 	WithAudioVideoData(LightingData) SALDataAudioAndVideoBuilder
-	// WithAudioVideoDataBuilder adds AudioVideoData (property field) which is build by the builder
-	WithAudioVideoDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataAudioAndVideoBuilder
 	// Build builds the SALDataAudioAndVideo or returns an error if something is wrong
 	Build() (SALDataAudioAndVideo, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataAudioAndVideoBuilder) WithAudioVideoData(audioVideoData Lightin
 	return m
 }
 
-func (m *_SALDataAudioAndVideoBuilder) WithAudioVideoDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataAudioAndVideoBuilder {
-	builder := builderSupplier(m.AudioVideoData.CreateLightingDataBuilder())
-	var err error
-	m.AudioVideoData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataAudioAndVideoBuilder) Build() (SALDataAudioAndVideo, error) {
 	if m.AudioVideoData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataClockAndTimekeeping.go b/plc4go/protocols/cbus/readwrite/model/SALDataClockAndTimekeeping.go
index 2f98928b1b7..3c28abf4800 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataClockAndTimekeeping.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataClockAndTimekeeping.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataClockAndTimekeepingBuilder interface {
 	WithMandatoryFields(clockAndTimekeepingData ClockAndTimekeepingData) SALDataClockAndTimekeepingBuilder
 	// WithClockAndTimekeepingData adds ClockAndTimekeepingData (property field)
 	WithClockAndTimekeepingData(ClockAndTimekeepingData) SALDataClockAndTimekeepingBuilder
-	// WithClockAndTimekeepingDataBuilder adds ClockAndTimekeepingData (property field) which is build by the builder
-	WithClockAndTimekeepingDataBuilder(func(ClockAndTimekeepingDataBuilder) ClockAndTimekeepingDataBuilder) SALDataClockAndTimekeepingBuilder
 	// Build builds the SALDataClockAndTimekeeping or returns an error if something is wrong
 	Build() (SALDataClockAndTimekeeping, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataClockAndTimekeepingBuilder) WithClockAndTimekeepingData(clockAn
 	return m
 }
 
-func (m *_SALDataClockAndTimekeepingBuilder) WithClockAndTimekeepingDataBuilder(builderSupplier func(ClockAndTimekeepingDataBuilder) ClockAndTimekeepingDataBuilder) SALDataClockAndTimekeepingBuilder {
-	builder := builderSupplier(m.ClockAndTimekeepingData.CreateClockAndTimekeepingDataBuilder())
-	var err error
-	m.ClockAndTimekeepingData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ClockAndTimekeepingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataClockAndTimekeepingBuilder) Build() (SALDataClockAndTimekeeping, error) {
 	if m.ClockAndTimekeepingData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataEnableControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataEnableControl.go
index c21d50ab206..53c36136f71 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataEnableControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataEnableControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataErrorReporting.go b/plc4go/protocols/cbus/readwrite/model/SALDataErrorReporting.go
index 91610c86b57..98bc2cea5af 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataErrorReporting.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataErrorReporting.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataErrorReportingBuilder interface {
 	WithMandatoryFields(errorReportingData ErrorReportingData) SALDataErrorReportingBuilder
 	// WithErrorReportingData adds ErrorReportingData (property field)
 	WithErrorReportingData(ErrorReportingData) SALDataErrorReportingBuilder
-	// WithErrorReportingDataBuilder adds ErrorReportingData (property field) which is build by the builder
-	WithErrorReportingDataBuilder(func(ErrorReportingDataBuilder) ErrorReportingDataBuilder) SALDataErrorReportingBuilder
 	// Build builds the SALDataErrorReporting or returns an error if something is wrong
 	Build() (SALDataErrorReporting, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataErrorReportingBuilder) WithErrorReportingData(errorReportingDat
 	return m
 }
 
-func (m *_SALDataErrorReportingBuilder) WithErrorReportingDataBuilder(builderSupplier func(ErrorReportingDataBuilder) ErrorReportingDataBuilder) SALDataErrorReportingBuilder {
-	builder := builderSupplier(m.ErrorReportingData.CreateErrorReportingDataBuilder())
-	var err error
-	m.ErrorReportingData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ErrorReportingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataErrorReportingBuilder) Build() (SALDataErrorReporting, error) {
 	if m.ErrorReportingData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataFreeUsage.go b/plc4go/protocols/cbus/readwrite/model/SALDataFreeUsage.go
index a41adb80d72..ce4afd0be59 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataFreeUsage.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataFreeUsage.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataHeating.go b/plc4go/protocols/cbus/readwrite/model/SALDataHeating.go
index 06d5852ce50..fe22fbcebcb 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataHeating.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataHeating.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataHeatingBuilder interface {
 	WithMandatoryFields(heatingData LightingData) SALDataHeatingBuilder
 	// WithHeatingData adds HeatingData (property field)
 	WithHeatingData(LightingData) SALDataHeatingBuilder
-	// WithHeatingDataBuilder adds HeatingData (property field) which is build by the builder
-	WithHeatingDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataHeatingBuilder
 	// Build builds the SALDataHeating or returns an error if something is wrong
 	Build() (SALDataHeating, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataHeatingBuilder) WithHeatingData(heatingData LightingData) SALDa
 	return m
 }
 
-func (m *_SALDataHeatingBuilder) WithHeatingDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataHeatingBuilder {
-	builder := builderSupplier(m.HeatingData.CreateLightingDataBuilder())
-	var err error
-	m.HeatingData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataHeatingBuilder) Build() (SALDataHeating, error) {
 	if m.HeatingData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataHvacActuator.go b/plc4go/protocols/cbus/readwrite/model/SALDataHvacActuator.go
index 8cc211ace62..5be439a032f 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataHvacActuator.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataHvacActuator.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataHvacActuatorBuilder interface {
 	WithMandatoryFields(hvacActuatorData LightingData) SALDataHvacActuatorBuilder
 	// WithHvacActuatorData adds HvacActuatorData (property field)
 	WithHvacActuatorData(LightingData) SALDataHvacActuatorBuilder
-	// WithHvacActuatorDataBuilder adds HvacActuatorData (property field) which is build by the builder
-	WithHvacActuatorDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataHvacActuatorBuilder
 	// Build builds the SALDataHvacActuator or returns an error if something is wrong
 	Build() (SALDataHvacActuator, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataHvacActuatorBuilder) WithHvacActuatorData(hvacActuatorData Ligh
 	return m
 }
 
-func (m *_SALDataHvacActuatorBuilder) WithHvacActuatorDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataHvacActuatorBuilder {
-	builder := builderSupplier(m.HvacActuatorData.CreateLightingDataBuilder())
-	var err error
-	m.HvacActuatorData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataHvacActuatorBuilder) Build() (SALDataHvacActuator, error) {
 	if m.HvacActuatorData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataIrrigationControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataIrrigationControl.go
index 91d520e011e..f9e2c8b7d50 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataIrrigationControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataIrrigationControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataIrrigationControlBuilder interface {
 	WithMandatoryFields(irrigationControlData LightingData) SALDataIrrigationControlBuilder
 	// WithIrrigationControlData adds IrrigationControlData (property field)
 	WithIrrigationControlData(LightingData) SALDataIrrigationControlBuilder
-	// WithIrrigationControlDataBuilder adds IrrigationControlData (property field) which is build by the builder
-	WithIrrigationControlDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataIrrigationControlBuilder
 	// Build builds the SALDataIrrigationControl or returns an error if something is wrong
 	Build() (SALDataIrrigationControl, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataIrrigationControlBuilder) WithIrrigationControlData(irrigationC
 	return m
 }
 
-func (m *_SALDataIrrigationControlBuilder) WithIrrigationControlDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataIrrigationControlBuilder {
-	builder := builderSupplier(m.IrrigationControlData.CreateLightingDataBuilder())
-	var err error
-	m.IrrigationControlData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataIrrigationControlBuilder) Build() (SALDataIrrigationControl, error) {
 	if m.IrrigationControlData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataLighting.go b/plc4go/protocols/cbus/readwrite/model/SALDataLighting.go
index ffc96ea2207..bb5f34151d9 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataLighting.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataLighting.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataLightingBuilder interface {
 	WithMandatoryFields(lightingData LightingData) SALDataLightingBuilder
 	// WithLightingData adds LightingData (property field)
 	WithLightingData(LightingData) SALDataLightingBuilder
-	// WithLightingDataBuilder adds LightingData (property field) which is build by the builder
-	WithLightingDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataLightingBuilder
 	// Build builds the SALDataLighting or returns an error if something is wrong
 	Build() (SALDataLighting, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataLightingBuilder) WithLightingData(lightingData LightingData) SA
 	return m
 }
 
-func (m *_SALDataLightingBuilder) WithLightingDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataLightingBuilder {
-	builder := builderSupplier(m.LightingData.CreateLightingDataBuilder())
-	var err error
-	m.LightingData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataLightingBuilder) Build() (SALDataLighting, error) {
 	if m.LightingData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataMeasurement.go b/plc4go/protocols/cbus/readwrite/model/SALDataMeasurement.go
index 8b7c0c50e9e..c0b2ccf391c 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataMeasurement.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataMeasurement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataMeasurementBuilder interface {
 	WithMandatoryFields(measurementData MeasurementData) SALDataMeasurementBuilder
 	// WithMeasurementData adds MeasurementData (property field)
 	WithMeasurementData(MeasurementData) SALDataMeasurementBuilder
-	// WithMeasurementDataBuilder adds MeasurementData (property field) which is build by the builder
-	WithMeasurementDataBuilder(func(MeasurementDataBuilder) MeasurementDataBuilder) SALDataMeasurementBuilder
 	// Build builds the SALDataMeasurement or returns an error if something is wrong
 	Build() (SALDataMeasurement, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataMeasurementBuilder) WithMeasurementData(measurementData Measure
 	return m
 }
 
-func (m *_SALDataMeasurementBuilder) WithMeasurementDataBuilder(builderSupplier func(MeasurementDataBuilder) MeasurementDataBuilder) SALDataMeasurementBuilder {
-	builder := builderSupplier(m.MeasurementData.CreateMeasurementDataBuilder())
-	var err error
-	m.MeasurementData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "MeasurementDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataMeasurementBuilder) Build() (SALDataMeasurement, error) {
 	if m.MeasurementData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataMediaTransport.go b/plc4go/protocols/cbus/readwrite/model/SALDataMediaTransport.go
index 675a9ae8ea0..dc5ec5d4274 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataMediaTransport.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataMediaTransport.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataMediaTransportBuilder interface {
 	WithMandatoryFields(mediaTransportControlData MediaTransportControlData) SALDataMediaTransportBuilder
 	// WithMediaTransportControlData adds MediaTransportControlData (property field)
 	WithMediaTransportControlData(MediaTransportControlData) SALDataMediaTransportBuilder
-	// WithMediaTransportControlDataBuilder adds MediaTransportControlData (property field) which is build by the builder
-	WithMediaTransportControlDataBuilder(func(MediaTransportControlDataBuilder) MediaTransportControlDataBuilder) SALDataMediaTransportBuilder
 	// Build builds the SALDataMediaTransport or returns an error if something is wrong
 	Build() (SALDataMediaTransport, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataMediaTransportBuilder) WithMediaTransportControlData(mediaTrans
 	return m
 }
 
-func (m *_SALDataMediaTransportBuilder) WithMediaTransportControlDataBuilder(builderSupplier func(MediaTransportControlDataBuilder) MediaTransportControlDataBuilder) SALDataMediaTransportBuilder {
-	builder := builderSupplier(m.MediaTransportControlData.CreateMediaTransportControlDataBuilder())
-	var err error
-	m.MediaTransportControlData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "MediaTransportControlDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataMediaTransportBuilder) Build() (SALDataMediaTransport, error) {
 	if m.MediaTransportControlData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataMetering.go b/plc4go/protocols/cbus/readwrite/model/SALDataMetering.go
index 74b86735cf5..12d7ba75b28 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataMetering.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataMetering.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataMeteringBuilder interface {
 	WithMandatoryFields(meteringData MeteringData) SALDataMeteringBuilder
 	// WithMeteringData adds MeteringData (property field)
 	WithMeteringData(MeteringData) SALDataMeteringBuilder
-	// WithMeteringDataBuilder adds MeteringData (property field) which is build by the builder
-	WithMeteringDataBuilder(func(MeteringDataBuilder) MeteringDataBuilder) SALDataMeteringBuilder
 	// Build builds the SALDataMetering or returns an error if something is wrong
 	Build() (SALDataMetering, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataMeteringBuilder) WithMeteringData(meteringData MeteringData) SA
 	return m
 }
 
-func (m *_SALDataMeteringBuilder) WithMeteringDataBuilder(builderSupplier func(MeteringDataBuilder) MeteringDataBuilder) SALDataMeteringBuilder {
-	builder := builderSupplier(m.MeteringData.CreateMeteringDataBuilder())
-	var err error
-	m.MeteringData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "MeteringDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataMeteringBuilder) Build() (SALDataMetering, error) {
 	if m.MeteringData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataPoolsSpasPondsFountainsControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataPoolsSpasPondsFountainsControl.go
index 494cb435056..5fad29beaa6 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataPoolsSpasPondsFountainsControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataPoolsSpasPondsFountainsControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataPoolsSpasPondsFountainsControlBuilder interface {
 	WithMandatoryFields(poolsSpaPondsFountainsData LightingData) SALDataPoolsSpasPondsFountainsControlBuilder
 	// WithPoolsSpaPondsFountainsData adds PoolsSpaPondsFountainsData (property field)
 	WithPoolsSpaPondsFountainsData(LightingData) SALDataPoolsSpasPondsFountainsControlBuilder
-	// WithPoolsSpaPondsFountainsDataBuilder adds PoolsSpaPondsFountainsData (property field) which is build by the builder
-	WithPoolsSpaPondsFountainsDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataPoolsSpasPondsFountainsControlBuilder
 	// Build builds the SALDataPoolsSpasPondsFountainsControl or returns an error if something is wrong
 	Build() (SALDataPoolsSpasPondsFountainsControl, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataPoolsSpasPondsFountainsControlBuilder) WithPoolsSpaPondsFountai
 	return m
 }
 
-func (m *_SALDataPoolsSpasPondsFountainsControlBuilder) WithPoolsSpaPondsFountainsDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataPoolsSpasPondsFountainsControlBuilder {
-	builder := builderSupplier(m.PoolsSpaPondsFountainsData.CreateLightingDataBuilder())
-	var err error
-	m.PoolsSpaPondsFountainsData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataPoolsSpasPondsFountainsControlBuilder) Build() (SALDataPoolsSpasPondsFountainsControl, error) {
 	if m.PoolsSpaPondsFountainsData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataReserved.go b/plc4go/protocols/cbus/readwrite/model/SALDataReserved.go
index 5992ffb1e30..6ba4842d70f 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataReserved.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataReserved.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataRoomControlSystem.go b/plc4go/protocols/cbus/readwrite/model/SALDataRoomControlSystem.go
index 4bb442a44f7..492e773a825 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataRoomControlSystem.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataRoomControlSystem.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataSecurity.go b/plc4go/protocols/cbus/readwrite/model/SALDataSecurity.go
index a093a7bef9b..008bee1e72c 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataSecurity.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataSecurity.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataSecurityBuilder interface {
 	WithMandatoryFields(securityData SecurityData) SALDataSecurityBuilder
 	// WithSecurityData adds SecurityData (property field)
 	WithSecurityData(SecurityData) SALDataSecurityBuilder
-	// WithSecurityDataBuilder adds SecurityData (property field) which is build by the builder
-	WithSecurityDataBuilder(func(SecurityDataBuilder) SecurityDataBuilder) SALDataSecurityBuilder
 	// Build builds the SALDataSecurity or returns an error if something is wrong
 	Build() (SALDataSecurity, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataSecurityBuilder) WithSecurityData(securityData SecurityData) SA
 	return m
 }
 
-func (m *_SALDataSecurityBuilder) WithSecurityDataBuilder(builderSupplier func(SecurityDataBuilder) SecurityDataBuilder) SALDataSecurityBuilder {
-	builder := builderSupplier(m.SecurityData.CreateSecurityDataBuilder())
-	var err error
-	m.SecurityData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SecurityDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataSecurityBuilder) Build() (SALDataSecurity, error) {
 	if m.SecurityData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataTelephonyStatusAndControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataTelephonyStatusAndControl.go
index 8d4f8c16284..a7d1711d316 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataTelephonyStatusAndControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataTelephonyStatusAndControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataTelephonyStatusAndControlBuilder interface {
 	WithMandatoryFields(telephonyData TelephonyData) SALDataTelephonyStatusAndControlBuilder
 	// WithTelephonyData adds TelephonyData (property field)
 	WithTelephonyData(TelephonyData) SALDataTelephonyStatusAndControlBuilder
-	// WithTelephonyDataBuilder adds TelephonyData (property field) which is build by the builder
-	WithTelephonyDataBuilder(func(TelephonyDataBuilder) TelephonyDataBuilder) SALDataTelephonyStatusAndControlBuilder
 	// Build builds the SALDataTelephonyStatusAndControl or returns an error if something is wrong
 	Build() (SALDataTelephonyStatusAndControl, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataTelephonyStatusAndControlBuilder) WithTelephonyData(telephonyDa
 	return m
 }
 
-func (m *_SALDataTelephonyStatusAndControlBuilder) WithTelephonyDataBuilder(builderSupplier func(TelephonyDataBuilder) TelephonyDataBuilder) SALDataTelephonyStatusAndControlBuilder {
-	builder := builderSupplier(m.TelephonyData.CreateTelephonyDataBuilder())
-	var err error
-	m.TelephonyData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "TelephonyDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataTelephonyStatusAndControlBuilder) Build() (SALDataTelephonyStatusAndControl, error) {
 	if m.TelephonyData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataTemperatureBroadcast.go b/plc4go/protocols/cbus/readwrite/model/SALDataTemperatureBroadcast.go
index bdfb9564676..c8aa21a1c30 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataTemperatureBroadcast.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataTemperatureBroadcast.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataTesting.go b/plc4go/protocols/cbus/readwrite/model/SALDataTesting.go
index da9c272f9c9..1a5e8b13df1 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataTesting.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataTesting.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataTriggerControl.go b/plc4go/protocols/cbus/readwrite/model/SALDataTriggerControl.go
index 7b1a3a2e3d6..61aef140382 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataTriggerControl.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataTriggerControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataTriggerControlBuilder interface {
 	WithMandatoryFields(triggerControlData TriggerControlData) SALDataTriggerControlBuilder
 	// WithTriggerControlData adds TriggerControlData (property field)
 	WithTriggerControlData(TriggerControlData) SALDataTriggerControlBuilder
-	// WithTriggerControlDataBuilder adds TriggerControlData (property field) which is build by the builder
-	WithTriggerControlDataBuilder(func(TriggerControlDataBuilder) TriggerControlDataBuilder) SALDataTriggerControlBuilder
 	// Build builds the SALDataTriggerControl or returns an error if something is wrong
 	Build() (SALDataTriggerControl, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataTriggerControlBuilder) WithTriggerControlData(triggerControlDat
 	return m
 }
 
-func (m *_SALDataTriggerControlBuilder) WithTriggerControlDataBuilder(builderSupplier func(TriggerControlDataBuilder) TriggerControlDataBuilder) SALDataTriggerControlBuilder {
-	builder := builderSupplier(m.TriggerControlData.CreateTriggerControlDataBuilder())
-	var err error
-	m.TriggerControlData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "TriggerControlDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataTriggerControlBuilder) Build() (SALDataTriggerControl, error) {
 	if m.TriggerControlData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SALDataVentilation.go b/plc4go/protocols/cbus/readwrite/model/SALDataVentilation.go
index 04c7e3d3cbd..f236463eeb3 100644
--- a/plc4go/protocols/cbus/readwrite/model/SALDataVentilation.go
+++ b/plc4go/protocols/cbus/readwrite/model/SALDataVentilation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type SALDataVentilationBuilder interface {
 	WithMandatoryFields(ventilationData LightingData) SALDataVentilationBuilder
 	// WithVentilationData adds VentilationData (property field)
 	WithVentilationData(LightingData) SALDataVentilationBuilder
-	// WithVentilationDataBuilder adds VentilationData (property field) which is build by the builder
-	WithVentilationDataBuilder(func(LightingDataBuilder) LightingDataBuilder) SALDataVentilationBuilder
 	// Build builds the SALDataVentilation or returns an error if something is wrong
 	Build() (SALDataVentilation, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_SALDataVentilationBuilder) WithVentilationData(ventilationData Lightin
 	return m
 }
 
-func (m *_SALDataVentilationBuilder) WithVentilationDataBuilder(builderSupplier func(LightingDataBuilder) LightingDataBuilder) SALDataVentilationBuilder {
-	builder := builderSupplier(m.VentilationData.CreateLightingDataBuilder())
-	var err error
-	m.VentilationData, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LightingDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SALDataVentilationBuilder) Build() (SALDataVentilation, error) {
 	if m.VentilationData == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go b/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
index c8782e42a2a..e189d9dddea 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityArmCode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go b/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
index de035970e30..37a8acab501 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
index a75b035903a..37e33577cef 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityData.go b/plc4go/protocols/cbus/readwrite/model/SecurityData.go
index f37146b05dd..32ad15876d3 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityData.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOff.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOff.go
index 779ad93900c..8e7347dff85 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOff.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOn.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOn.go
index 6348fb7f5e6..ce38fcee252 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOn.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataAlarmOn.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedCleared.go
index 174379e849f..5fb896f74e2 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedRaised.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedRaised.go
index e61c1779ff2..329bb74f440 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedRaised.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmFailedRaised.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmReadyNotReady.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmReadyNotReady.go
index 0bdd20fbfc3..c17aa9807b5 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmReadyNotReady.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmReadyNotReady.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmSystem.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmSystem.go
index a10c52925e6..ef2ce08fee7 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataArmSystem.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataArmSystem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataCurrentAlarmType.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataCurrentAlarmType.go
index 2774301ad10..64a044df312 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataCurrentAlarmType.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataCurrentAlarmType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataDisplayMessage.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataDisplayMessage.go
index 30b969b9b9a..ec2dc3e3e95 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataDisplayMessage.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataDisplayMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataDropTamper.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataDropTamper.go
index 2f78b973e1d..2d5335391e6 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataDropTamper.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataDropTamper.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataEmulatedKeypad.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataEmulatedKeypad.go
index 1a482746e8a..9dad6b6e483 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataEmulatedKeypad.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataEmulatedKeypad.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataEntryDelayStarted.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataEntryDelayStarted.go
index 4f1c0c9b95c..2c9a9fbbcb7 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataEntryDelayStarted.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataEntryDelayStarted.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataEvent.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataEvent.go
index 168e3451c1b..67a3393f578 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataEvent.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataExitDelayStarted.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataExitDelayStarted.go
index deb923b53ab..0c015240faa 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataExitDelayStarted.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataExitDelayStarted.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmCleared.go
index 5980a61927d..bffd74a9248 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmRaised.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmRaised.go
index a6080656c12..4067c638d51 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmRaised.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataFireAlarmRaised.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmCleared.go
index 031e8c43d77..94014df1aac 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmRaised.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmRaised.go
index 3c68bae7d72..4a73c0e877b 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmRaised.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataGasAlarmRaised.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmCleared.go
index d9ff6bda8cf..74d0e3c12e4 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmRaised.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmRaised.go
index 91cac56225d..3eb8d857dd2 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmRaised.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataLineCutAlarmRaised.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCharging.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCharging.go
index 09b6de4333d..e31cb1bf4ce 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCharging.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCharging.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCorrected.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCorrected.go
index d9abefa1ea3..7473bd494c2 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCorrected.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryCorrected.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryDetected.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryDetected.go
index cf28b96f555..9e9359bff5b 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryDetected.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataLowBatteryDetected.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsFailure.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsFailure.go
index 41add265e2b..93c672f1a67 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsFailure.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsFailure.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsRestoredOrApplied.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsRestoredOrApplied.go
index 70e2167e1bf..018abc92a7b 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsRestoredOrApplied.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataMainsRestoredOrApplied.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataOff.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataOff.go
index 151a55548d4..9a406da5848 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataOff.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataOn.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataOn.go
index e54c9bcc84a..e66029496ad 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataOn.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataOn.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmCleared.go
index 31a56b0dbd1..3514c4c0af0 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmRaised.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmRaised.go
index 54389a83400..7bb337ca5a3 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmRaised.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataOtherAlarmRaised.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicActivated.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicActivated.go
index 1fcba978e6f..2dcc4e8b66d 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicActivated.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicActivated.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicCleared.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicCleared.go
index 2ecda31a5c5..0c34cdcedb2 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicCleared.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataPanicCleared.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataPasswordEntryStatus.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataPasswordEntryStatus.go
index 9825f926f0c..daa9aa69b09 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataPasswordEntryStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataPasswordEntryStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseAlarm.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseAlarm.go
index e665e5c4f5f..c799e9d21af 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseAlarm.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseAlarm.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseTamper.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseTamper.go
index f0acfe83381..d7d5be7a573 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseTamper.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataRaiseTamper.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataRequestZoneName.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataRequestZoneName.go
index 2c12fdbc222..6d1e059c35d 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataRequestZoneName.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataRequestZoneName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus1Request.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus1Request.go
index 7f14b39c9e0..f6c1f53a9ba 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus1Request.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus1Request.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus2Request.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus2Request.go
index 07e5704a005..524689059bd 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus2Request.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatus2Request.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport1.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport1.go
index 94a16c9b6e8..4949a989683 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport1.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport2.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport2.go
index a11869bd8b0..71dbd12b0cf 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport2.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataStatusReport2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemArmedDisarmed.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemArmedDisarmed.go
index 6f9c1ab776e..9e2d027fbf8 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemArmedDisarmed.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemArmedDisarmed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemDisarmed.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemDisarmed.go
index 5e4797980bb..774bac12b2a 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemDisarmed.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataSystemDisarmed.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOff.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOff.go
index 64a1050bc0b..9cbe0ae22d5 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOff.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOff.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOn.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOn.go
index 3e518ddf458..2f1f9ee8745 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOn.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataTamperOn.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneIsolated.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneIsolated.go
index 0a426fcfed9..9800ca6ad7c 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneIsolated.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneIsolated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneName.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneName.go
index 6b22bc869c6..c52ccf9199d 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneName.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneOpen.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneOpen.go
index a0befa76843..1a9ad2977d2 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneOpen.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneOpen.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneSealed.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneSealed.go
index 2e50b37c79f..f452b810dad 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneSealed.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneSealed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneShort.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneShort.go
index a31aef1f8fd..edcd3465f79 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneShort.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneShort.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneUnsealed.go b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneUnsealed.go
index fbe2106f2de..e5f42c93506 100644
--- a/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneUnsealed.go
+++ b/plc4go/protocols/cbus/readwrite/model/SecurityDataZoneUnsealed.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go b/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
index af9c0b8505b..901382b82f8 100644
--- a/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/SerialInterfaceAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/SerialNumber.go b/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
index 23f4e662403..7de449c7aef 100644
--- a/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
+++ b/plc4go/protocols/cbus/readwrite/model/SerialNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go b/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
index b6adf8724b5..e0c8fe803f0 100644
--- a/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/ServerErrorReply.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusByte.go b/plc4go/protocols/cbus/readwrite/model/StatusByte.go
index 302f8299601..5e98e0a7f50 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusByte.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusByte.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusCoding.go b/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
index 403c8b3f12e..c142b52e51b 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusCoding.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
index 57486bf9232..9c5ed09b02a 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
index 8476e3eda34..31a07f0bd33 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryState.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
index 27d204e96a4..d20e2e4cec4 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
index 0fe7570352e..b949f49796b 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequestLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TamperStatus.go b/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
index 852e635261a..2184b58f531 100644
--- a/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/TamperStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
index 88b111aee4a..b8dca4dc4f7 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
index ff2185d8e2d..bc5557b6d96 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyData.go b/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
index ed4f70fa2ca..4584593d68f 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataClearDiversion.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataClearDiversion.go
index 4c66323b031..f323224ab76 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataClearDiversion.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataClearDiversion.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialInFailure.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialInFailure.go
index 25295a07fae..14a407faa71 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialInFailure.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialInFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialOutFailure.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialOutFailure.go
index cba70ee918e..7c53ccfb8fe 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialOutFailure.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDialOutFailure.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDivert.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDivert.go
index 995fbdcdf42..aa5f831cfb3 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataDivert.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataDivert.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataInternetConnectionRequestMade.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataInternetConnectionRequestMade.go
index 854d1863eac..ec28bf1486f 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataInternetConnectionRequestMade.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataInternetConnectionRequestMade.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataIsolateSecondaryOutlet.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataIsolateSecondaryOutlet.go
index d1df2580b5c..91b5c7264ed 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataIsolateSecondaryOutlet.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataIsolateSecondaryOutlet.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOffHook.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOffHook.go
index e35d4c6e371..7cfadaf1b10 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOffHook.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOffHook.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOnHook.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOnHook.go
index 91ccde76e1c..3a5fb36863f 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOnHook.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataLineOnHook.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumber.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumber.go
index 93759a9cad6..42bbec03704 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumber.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumberRequest.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumberRequest.go
index 3c33baabc52..d7572242f75 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumberRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRecallLastNumberRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRejectIncomingCall.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRejectIncomingCall.go
index 23315dd5415..1fda0b6edd8 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRejectIncomingCall.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRejectIncomingCall.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
index dfcdd30339c..eaac87da1be 100644
--- a/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
+++ b/plc4go/protocols/cbus/readwrite/model/TelephonyDataRinging.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
index 253e9a15b1b..c06585f9a36 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
index 1ed44936b09..20d975e9f7d 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
index 148c0031293..4bde886bb4d 100644
--- a/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TemperatureBroadcastData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
index 2218c83ba85..8cb5e0d3338 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
index 8215c73ddf2..0c088f2af67 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlCommandTypeContainer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
index 434d1e7a26e..12588e7032c 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataIndicatorKill.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataIndicatorKill.go
index b8e94d98f09..908f7bdbd54 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataIndicatorKill.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataIndicatorKill.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataLabel.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataLabel.go
index 7cbe6b67bf7..d80d004f313 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataLabel.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataLabel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerEvent.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerEvent.go
index 17479c246b8..15b64eee348 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerEvent.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMax.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMax.go
index 8aeea87cd0b..c2f6f776ea0 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMax.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMax.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMin.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMin.go
index 2da40f9cb3b..379155ac1e1 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMin.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlDataTriggerMin.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
index e9f3241a7d7..13968e0f41b 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelFlavour.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
index 6cad9b6ca38..957b6d48942 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelOptions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
index d8bc7f89f91..75a430368be 100644
--- a/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
+++ b/plc4go/protocols/cbus/readwrite/model/TriggerControlLabelType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/UnitAddress.go b/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
index 7da5322e778..4997545ec6e 100644
--- a/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
+++ b/plc4go/protocols/cbus/readwrite/model/UnitAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/UnitStatus.go b/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
index 14d371c23b3..5b8f8e5f776 100644
--- a/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/UnitStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go b/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
index 71391ee74d4..015abaf10ae 100644
--- a/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
+++ b/plc4go/protocols/cbus/readwrite/model/ZoneStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go b/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
index f1186ea6354..1e176a677bc 100644
--- a/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
+++ b/plc4go/protocols/cbus/readwrite/model/ZoneStatusTemp.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/ParserHelper.go b/plc4go/protocols/df1/readwrite/ParserHelper.go
index 48df62fd9c8..0e78aaecb2a 100644
--- a/plc4go/protocols/df1/readwrite/ParserHelper.go
+++ b/plc4go/protocols/df1/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/df1/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/XmlParserHelper.go b/plc4go/protocols/df1/readwrite/XmlParserHelper.go
index 5021cc223c6..75888b60525 100644
--- a/plc4go/protocols/df1/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/df1/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/df1/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1Command.go b/plc4go/protocols/df1/readwrite/model/DF1Command.go
index c581aa2e3c5..1a70293c61e 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1Command.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1Command.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1Symbol.go b/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
index d111ac658cd..ca6b844ad96 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1Symbol.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrame.go b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrame.go
index f0d9982e170..560258ddf77 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrame.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrame.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -98,8 +100,6 @@ type DF1SymbolMessageFrameBuilder interface {
 	WithSourceAddress(uint8) DF1SymbolMessageFrameBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(DF1Command) DF1SymbolMessageFrameBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(DF1CommandBuilder) DF1CommandBuilder) DF1SymbolMessageFrameBuilder
 	// Build builds the DF1SymbolMessageFrame or returns an error if something is wrong
 	Build() (DF1SymbolMessageFrame, error)
 	// MustBuild does the same as Build but panics on error
@@ -138,19 +138,6 @@ func (m *_DF1SymbolMessageFrameBuilder) WithCommand(command DF1Command) DF1Symbo
 	return m
 }
 
-func (m *_DF1SymbolMessageFrameBuilder) WithCommandBuilder(builderSupplier func(DF1CommandBuilder) DF1CommandBuilder) DF1SymbolMessageFrameBuilder {
-	builder := builderSupplier(m.Command.CreateDF1CommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "DF1CommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DF1SymbolMessageFrameBuilder) Build() (DF1SymbolMessageFrame, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameACK.go b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameACK.go
index 6d1f7ab2a25..b8ac9813c76 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameACK.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameACK.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameNAK.go b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
index 59bc38528ad..cdb5b4fd2cf 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadRequest.go b/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadRequest.go
index 0f084f84336..3e2988ece63 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadRequest.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadResponse.go
index 852059fcdbe..4c83cb79759 100644
--- a/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadResponse.go
+++ b/plc4go/protocols/df1/readwrite/model/DF1UnprotectedReadResponse.go
@@ -22,10 +22,12 @@ package model
 import (
 	"context"
 	"fmt"
-	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/ParserHelper.go b/plc4go/protocols/eip/readwrite/ParserHelper.go
index 147b6902e19..6a98e27fb87 100644
--- a/plc4go/protocols/eip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/eip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/XmlParserHelper.go b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
index d9affb11f96..52fc84ed3b7 100644
--- a/plc4go/protocols/eip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/eip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go b/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
index de8e8b62871..e7df00e560a 100644
--- a/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPAttributes.go b/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
index b6fbfbed022..59a21745c19 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPAttributes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPClassID.go b/plc4go/protocols/eip/readwrite/model/CIPClassID.go
index 022f4dbfdf4..02b1a320069 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPClassID.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPClassID.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPData.go b/plc4go/protocols/eip/readwrite/model/CIPData.go
index 00f6d2516ff..aa880b6a186 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPData.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
index b8003241b0f..9fd4e51aa6c 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go b/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
index bfc10e30c43..fbf030f7295 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPDataTypeCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPStatus.go b/plc4go/protocols/eip/readwrite/model/CIPStatus.go
index f0ae35047e8..4cf8d0bb6ca 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPStatus.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go b/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
index 49acf4022d7..3577e175acd 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPStructTypeCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
index 1681cd85586..fb81c3af7c6 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
index b64d67f6dd5..b2daa7cb8d2 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
index ae543b3120f..7f2276e40b8 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -127,12 +129,8 @@ type CipConnectionManagerCloseRequestBuilder interface {
 	WithRequestPathSize(uint8) CipConnectionManagerCloseRequestBuilder
 	// WithClassSegment adds ClassSegment (property field)
 	WithClassSegment(PathSegment) CipConnectionManagerCloseRequestBuilder
-	// WithClassSegmentBuilder adds ClassSegment (property field) which is build by the builder
-	WithClassSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerCloseRequestBuilder
 	// WithInstanceSegment adds InstanceSegment (property field)
 	WithInstanceSegment(PathSegment) CipConnectionManagerCloseRequestBuilder
-	// WithInstanceSegmentBuilder adds InstanceSegment (property field) which is build by the builder
-	WithInstanceSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerCloseRequestBuilder
 	// WithPriority adds Priority (property field)
 	WithPriority(uint8) CipConnectionManagerCloseRequestBuilder
 	// WithTickTime adds TickTime (property field)
@@ -182,37 +180,11 @@ func (m *_CipConnectionManagerCloseRequestBuilder) WithClassSegment(classSegment
 	return m
 }
 
-func (m *_CipConnectionManagerCloseRequestBuilder) WithClassSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerCloseRequestBuilder {
-	builder := builderSupplier(m.ClassSegment.CreatePathSegmentBuilder())
-	var err error
-	m.ClassSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipConnectionManagerCloseRequestBuilder) WithInstanceSegment(instanceSegment PathSegment) CipConnectionManagerCloseRequestBuilder {
 	m.InstanceSegment = instanceSegment
 	return m
 }
 
-func (m *_CipConnectionManagerCloseRequestBuilder) WithInstanceSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerCloseRequestBuilder {
-	builder := builderSupplier(m.InstanceSegment.CreatePathSegmentBuilder())
-	var err error
-	m.InstanceSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipConnectionManagerCloseRequestBuilder) WithPriority(priority uint8) CipConnectionManagerCloseRequestBuilder {
 	m.Priority = priority
 	return m
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
index cba9548aec4..668a42ebba3 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
index 3295e14c490..90c2d8edab2 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -162,12 +164,8 @@ type CipConnectionManagerRequestBuilder interface {
 	WithMandatoryFields(classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, timeoutMultiplier uint8, otRpi uint32, otConnectionParameters NetworkConnectionParameters, toRpi uint32, toConnectionParameters NetworkConnectionParameters, transportType TransportType, connectionPathSize uint8, connectionPaths []PathSegment) CipConnectionManagerRequestBuilder
 	// WithClassSegment adds ClassSegment (property field)
 	WithClassSegment(PathSegment) CipConnectionManagerRequestBuilder
-	// WithClassSegmentBuilder adds ClassSegment (property field) which is build by the builder
-	WithClassSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerRequestBuilder
 	// WithInstanceSegment adds InstanceSegment (property field)
 	WithInstanceSegment(PathSegment) CipConnectionManagerRequestBuilder
-	// WithInstanceSegmentBuilder adds InstanceSegment (property field) which is build by the builder
-	WithInstanceSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerRequestBuilder
 	// WithPriority adds Priority (property field)
 	WithPriority(uint8) CipConnectionManagerRequestBuilder
 	// WithTickTime adds TickTime (property field)
@@ -234,37 +232,11 @@ func (m *_CipConnectionManagerRequestBuilder) WithClassSegment(classSegment Path
 	return m
 }
 
-func (m *_CipConnectionManagerRequestBuilder) WithClassSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerRequestBuilder {
-	builder := builderSupplier(m.ClassSegment.CreatePathSegmentBuilder())
-	var err error
-	m.ClassSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipConnectionManagerRequestBuilder) WithInstanceSegment(instanceSegment PathSegment) CipConnectionManagerRequestBuilder {
 	m.InstanceSegment = instanceSegment
 	return m
 }
 
-func (m *_CipConnectionManagerRequestBuilder) WithInstanceSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipConnectionManagerRequestBuilder {
-	builder := builderSupplier(m.InstanceSegment.CreatePathSegmentBuilder())
-	var err error
-	m.InstanceSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipConnectionManagerRequestBuilder) WithPriority(priority uint8) CipConnectionManagerRequestBuilder {
 	m.Priority = priority
 	return m
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
index cf6a5c92b57..0146e948ac3 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipIdentity.go b/plc4go/protocols/eip/readwrite/model/CipIdentity.go
index 3d2de694a12..15e7f0eb3fe 100644
--- a/plc4go/protocols/eip/readwrite/model/CipIdentity.go
+++ b/plc4go/protocols/eip/readwrite/model/CipIdentity.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipRRData.go b/plc4go/protocols/eip/readwrite/model/CipRRData.go
index 69a4b2fae76..649caedbb36 100644
--- a/plc4go/protocols/eip/readwrite/model/CipRRData.go
+++ b/plc4go/protocols/eip/readwrite/model/CipRRData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
index 6e1dfa247ad..e48c49d9420 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
index 2036cb36d78..069b9233255 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipSecurityInformation.go b/plc4go/protocols/eip/readwrite/model/CipSecurityInformation.go
index 427837664c5..f0380eb35e3 100644
--- a/plc4go/protocols/eip/readwrite/model/CipSecurityInformation.go
+++ b/plc4go/protocols/eip/readwrite/model/CipSecurityInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipService.go b/plc4go/protocols/eip/readwrite/model/CipService.go
index c9026c3496a..dcadded071e 100644
--- a/plc4go/protocols/eip/readwrite/model/CipService.go
+++ b/plc4go/protocols/eip/readwrite/model/CipService.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
index 8124b3d099b..8ff7852b686 100644
--- a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -107,16 +109,10 @@ type CipUnconnectedRequestBuilder interface {
 	WithMandatoryFields(classSegment PathSegment, instanceSegment PathSegment, unconnectedService CipService, backPlane int8, slot int8) CipUnconnectedRequestBuilder
 	// WithClassSegment adds ClassSegment (property field)
 	WithClassSegment(PathSegment) CipUnconnectedRequestBuilder
-	// WithClassSegmentBuilder adds ClassSegment (property field) which is build by the builder
-	WithClassSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipUnconnectedRequestBuilder
 	// WithInstanceSegment adds InstanceSegment (property field)
 	WithInstanceSegment(PathSegment) CipUnconnectedRequestBuilder
-	// WithInstanceSegmentBuilder adds InstanceSegment (property field) which is build by the builder
-	WithInstanceSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) CipUnconnectedRequestBuilder
 	// WithUnconnectedService adds UnconnectedService (property field)
 	WithUnconnectedService(CipService) CipUnconnectedRequestBuilder
-	// WithUnconnectedServiceBuilder adds UnconnectedService (property field) which is build by the builder
-	WithUnconnectedServiceBuilder(func(CipServiceBuilder) CipServiceBuilder) CipUnconnectedRequestBuilder
 	// WithBackPlane adds BackPlane (property field)
 	WithBackPlane(int8) CipUnconnectedRequestBuilder
 	// WithSlot adds Slot (property field)
@@ -149,55 +145,16 @@ func (m *_CipUnconnectedRequestBuilder) WithClassSegment(classSegment PathSegmen
 	return m
 }
 
-func (m *_CipUnconnectedRequestBuilder) WithClassSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipUnconnectedRequestBuilder {
-	builder := builderSupplier(m.ClassSegment.CreatePathSegmentBuilder())
-	var err error
-	m.ClassSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipUnconnectedRequestBuilder) WithInstanceSegment(instanceSegment PathSegment) CipUnconnectedRequestBuilder {
 	m.InstanceSegment = instanceSegment
 	return m
 }
 
-func (m *_CipUnconnectedRequestBuilder) WithInstanceSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) CipUnconnectedRequestBuilder {
-	builder := builderSupplier(m.InstanceSegment.CreatePathSegmentBuilder())
-	var err error
-	m.InstanceSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipUnconnectedRequestBuilder) WithUnconnectedService(unconnectedService CipService) CipUnconnectedRequestBuilder {
 	m.UnconnectedService = unconnectedService
 	return m
 }
 
-func (m *_CipUnconnectedRequestBuilder) WithUnconnectedServiceBuilder(builderSupplier func(CipServiceBuilder) CipServiceBuilder) CipUnconnectedRequestBuilder {
-	builder := builderSupplier(m.UnconnectedService.CreateCipServiceBuilder())
-	var err error
-	m.UnconnectedService, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CipServiceBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CipUnconnectedRequestBuilder) WithBackPlane(backPlane int8) CipUnconnectedRequestBuilder {
 	m.BackPlane = backPlane
 	return m
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
index 6102a87313d..1d3cd2d9a91 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
index 307110c05aa..8596ac72b45 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ClassID.go b/plc4go/protocols/eip/readwrite/model/ClassID.go
index 105ff56b1f6..9a10bc70b71 100644
--- a/plc4go/protocols/eip/readwrite/model/ClassID.go
+++ b/plc4go/protocols/eip/readwrite/model/ClassID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ClassSegment.go b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
index fd5246012f3..918ff6c18a6 100644
--- a/plc4go/protocols/eip/readwrite/model/ClassSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go b/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
index 36ff987f3c4..2af40789d73 100644
--- a/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/CommandSpecificDataItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go b/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
index cb761e38203..d113be30edc 100644
--- a/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
+++ b/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go b/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
index 9636ffc4957..0b18a03c627 100644
--- a/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type ConnectedDataItemBuilder interface {
 	WithSequenceCount(uint16) ConnectedDataItemBuilder
 	// WithService adds Service (property field)
 	WithService(CipService) ConnectedDataItemBuilder
-	// WithServiceBuilder adds Service (property field) which is build by the builder
-	WithServiceBuilder(func(CipServiceBuilder) CipServiceBuilder) ConnectedDataItemBuilder
 	// Build builds the ConnectedDataItem or returns an error if something is wrong
 	Build() (ConnectedDataItem, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_ConnectedDataItemBuilder) WithService(service CipService) ConnectedDat
 	return m
 }
 
-func (m *_ConnectedDataItemBuilder) WithServiceBuilder(builderSupplier func(CipServiceBuilder) CipServiceBuilder) ConnectedDataItemBuilder {
-	builder := builderSupplier(m.Service.CreateCipServiceBuilder())
-	var err error
-	m.Service, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CipServiceBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ConnectedDataItemBuilder) Build() (ConnectedDataItem, error) {
 	if m.Service == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/eip/readwrite/model/DataSegment.go b/plc4go/protocols/eip/readwrite/model/DataSegment.go
index 5fddd238110..a39c1ced4a9 100644
--- a/plc4go/protocols/eip/readwrite/model/DataSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/DataSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type DataSegmentBuilder interface {
 	WithMandatoryFields(segmentType DataSegmentType) DataSegmentBuilder
 	// WithSegmentType adds SegmentType (property field)
 	WithSegmentType(DataSegmentType) DataSegmentBuilder
-	// WithSegmentTypeBuilder adds SegmentType (property field) which is build by the builder
-	WithSegmentTypeBuilder(func(DataSegmentTypeBuilder) DataSegmentTypeBuilder) DataSegmentBuilder
 	// Build builds the DataSegment or returns an error if something is wrong
 	Build() (DataSegment, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_DataSegmentBuilder) WithSegmentType(segmentType DataSegmentType) DataS
 	return m
 }
 
-func (m *_DataSegmentBuilder) WithSegmentTypeBuilder(builderSupplier func(DataSegmentTypeBuilder) DataSegmentTypeBuilder) DataSegmentBuilder {
-	builder := builderSupplier(m.SegmentType.CreateDataSegmentTypeBuilder())
-	var err error
-	m.SegmentType, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "DataSegmentTypeBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DataSegmentBuilder) Build() (DataSegment, error) {
 	if m.SegmentType == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
index 7c4d7417645..22626757206 100644
--- a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EiPCommand.go b/plc4go/protocols/eip/readwrite/model/EiPCommand.go
index cb999e8cec1..0c12675b881 100644
--- a/plc4go/protocols/eip/readwrite/model/EiPCommand.go
+++ b/plc4go/protocols/eip/readwrite/model/EiPCommand.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go b/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
index ea3955ed160..6a5221e5aea 100644
--- a/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go b/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
index 62fc3182318..8139592626b 100644
--- a/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipConstants.go b/plc4go/protocols/eip/readwrite/model/EipConstants.go
index 186437d8292..62a97494a26 100644
--- a/plc4go/protocols/eip/readwrite/model/EipConstants.go
+++ b/plc4go/protocols/eip/readwrite/model/EipConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go b/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
index 3d8a480b881..33897d9c24e 100644
--- a/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipListIdentityRequest.go b/plc4go/protocols/eip/readwrite/model/EipListIdentityRequest.go
index 8bea2a7530a..25d236c70e9 100644
--- a/plc4go/protocols/eip/readwrite/model/EipListIdentityRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/EipListIdentityRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipListIdentityResponse.go b/plc4go/protocols/eip/readwrite/model/EipListIdentityResponse.go
index 06830141421..788ff31ba6f 100644
--- a/plc4go/protocols/eip/readwrite/model/EipListIdentityResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/EipListIdentityResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/EipPacket.go b/plc4go/protocols/eip/readwrite/model/EipPacket.go
index 7caadf11ac2..e78542f2355 100644
--- a/plc4go/protocols/eip/readwrite/model/EipPacket.go
+++ b/plc4go/protocols/eip/readwrite/model/EipPacket.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
index 67b2d52fb74..103b5c5f69c 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -87,12 +89,8 @@ type GetAttributeAllRequestBuilder interface {
 	WithMandatoryFields(classSegment PathSegment, instanceSegment PathSegment) GetAttributeAllRequestBuilder
 	// WithClassSegment adds ClassSegment (property field)
 	WithClassSegment(PathSegment) GetAttributeAllRequestBuilder
-	// WithClassSegmentBuilder adds ClassSegment (property field) which is build by the builder
-	WithClassSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) GetAttributeAllRequestBuilder
 	// WithInstanceSegment adds InstanceSegment (property field)
 	WithInstanceSegment(PathSegment) GetAttributeAllRequestBuilder
-	// WithInstanceSegmentBuilder adds InstanceSegment (property field) which is build by the builder
-	WithInstanceSegmentBuilder(func(PathSegmentBuilder) PathSegmentBuilder) GetAttributeAllRequestBuilder
 	// Build builds the GetAttributeAllRequest or returns an error if something is wrong
 	Build() (GetAttributeAllRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,37 +119,11 @@ func (m *_GetAttributeAllRequestBuilder) WithClassSegment(classSegment PathSegme
 	return m
 }
 
-func (m *_GetAttributeAllRequestBuilder) WithClassSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) GetAttributeAllRequestBuilder {
-	builder := builderSupplier(m.ClassSegment.CreatePathSegmentBuilder())
-	var err error
-	m.ClassSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_GetAttributeAllRequestBuilder) WithInstanceSegment(instanceSegment PathSegment) GetAttributeAllRequestBuilder {
 	m.InstanceSegment = instanceSegment
 	return m
 }
 
-func (m *_GetAttributeAllRequestBuilder) WithInstanceSegmentBuilder(builderSupplier func(PathSegmentBuilder) PathSegmentBuilder) GetAttributeAllRequestBuilder {
-	builder := builderSupplier(m.InstanceSegment.CreatePathSegmentBuilder())
-	var err error
-	m.InstanceSegment, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PathSegmentBuilder failed"))
-	}
-	return m
-}
-
 func (m *_GetAttributeAllRequestBuilder) Build() (GetAttributeAllRequest, error) {
 	if m.ClassSegment == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
index 5f50c235c19..aaeaf13f00d 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
index 7b5d13fd7be..e57bc998c88 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeListRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
index 01b6cced64d..fac46635b69 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeListResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
index f0cd785b7ba..42316a225c4 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
index 13656adcfae..511352bd6ba 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeSingleResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/InstanceID.go b/plc4go/protocols/eip/readwrite/model/InstanceID.go
index 4c4183c9367..bc9a43426c1 100644
--- a/plc4go/protocols/eip/readwrite/model/InstanceID.go
+++ b/plc4go/protocols/eip/readwrite/model/InstanceID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
index ff17441b20e..da873e51449 100644
--- a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go b/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
index a72b290f431..a591d4ddf2f 100644
--- a/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go b/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
index c80adbe7e1c..fb125c86819 100644
--- a/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/LogicalSegment.go b/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
index 55c2a280a62..34cb8bcb9b3 100644
--- a/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type LogicalSegmentBuilder interface {
 	WithMandatoryFields(segmentType LogicalSegmentType) LogicalSegmentBuilder
 	// WithSegmentType adds SegmentType (property field)
 	WithSegmentType(LogicalSegmentType) LogicalSegmentBuilder
-	// WithSegmentTypeBuilder adds SegmentType (property field) which is build by the builder
-	WithSegmentTypeBuilder(func(LogicalSegmentTypeBuilder) LogicalSegmentTypeBuilder) LogicalSegmentBuilder
 	// Build builds the LogicalSegment or returns an error if something is wrong
 	Build() (LogicalSegment, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_LogicalSegmentBuilder) WithSegmentType(segmentType LogicalSegmentType)
 	return m
 }
 
-func (m *_LogicalSegmentBuilder) WithSegmentTypeBuilder(builderSupplier func(LogicalSegmentTypeBuilder) LogicalSegmentTypeBuilder) LogicalSegmentBuilder {
-	builder := builderSupplier(m.SegmentType.CreateLogicalSegmentTypeBuilder())
-	var err error
-	m.SegmentType, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LogicalSegmentTypeBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LogicalSegmentBuilder) Build() (LogicalSegment, error) {
 	if m.SegmentType == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
index bf3ad992a26..f496d550935 100644
--- a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/MemberID.go b/plc4go/protocols/eip/readwrite/model/MemberID.go
index 34911ee43e5..dbb8bcf9f22 100644
--- a/plc4go/protocols/eip/readwrite/model/MemberID.go
+++ b/plc4go/protocols/eip/readwrite/model/MemberID.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
index 4d95fd75ae4..5e843ad2fc4 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
index 09d40473d84..68b48ce3bba 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
index 5dbdcc8ed3e..d80df3b10db 100644
--- a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
+++ b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NullAddressItem.go b/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
index 60059b5da72..5614dcf804e 100644
--- a/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
+++ b/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go b/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
index 449a39631cd..cc4e363ec45 100644
--- a/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go b/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
index d00fc303fdd..e28aa6f515f 100644
--- a/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go b/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
index f6df30d4f83..4e3a19731c9 100644
--- a/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go b/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
index 3381242389c..c63936ebb25 100644
--- a/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/PathSegment.go b/plc4go/protocols/eip/readwrite/model/PathSegment.go
index 59fc54007ad..8d49d1844b8 100644
--- a/plc4go/protocols/eip/readwrite/model/PathSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/PathSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegment.go b/plc4go/protocols/eip/readwrite/model/PortSegment.go
index 6429ce2d633..f85e39a210f 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegment.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type PortSegmentBuilder interface {
 	WithMandatoryFields(segmentType PortSegmentType) PortSegmentBuilder
 	// WithSegmentType adds SegmentType (property field)
 	WithSegmentType(PortSegmentType) PortSegmentBuilder
-	// WithSegmentTypeBuilder adds SegmentType (property field) which is build by the builder
-	WithSegmentTypeBuilder(func(PortSegmentTypeBuilder) PortSegmentTypeBuilder) PortSegmentBuilder
 	// Build builds the PortSegment or returns an error if something is wrong
 	Build() (PortSegment, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_PortSegmentBuilder) WithSegmentType(segmentType PortSegmentType) PortS
 	return m
 }
 
-func (m *_PortSegmentBuilder) WithSegmentTypeBuilder(builderSupplier func(PortSegmentTypeBuilder) PortSegmentTypeBuilder) PortSegmentBuilder {
-	builder := builderSupplier(m.SegmentType.CreatePortSegmentTypeBuilder())
-	var err error
-	m.SegmentType, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PortSegmentTypeBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PortSegmentBuilder) Build() (PortSegment, error) {
 	if m.SegmentType == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go b/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
index b8221d3ebbb..87af0d7f215 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go b/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
index 6a661222e47..526e15d9c45 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
index 50212a8b7de..830e4f6f68e 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SendUnitData.go b/plc4go/protocols/eip/readwrite/model/SendUnitData.go
index dc3ea8e656a..1fe327bdc62 100644
--- a/plc4go/protocols/eip/readwrite/model/SendUnitData.go
+++ b/plc4go/protocols/eip/readwrite/model/SendUnitData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/Services.go b/plc4go/protocols/eip/readwrite/model/Services.go
index d971495aa0a..f26b4eb1321 100644
--- a/plc4go/protocols/eip/readwrite/model/Services.go
+++ b/plc4go/protocols/eip/readwrite/model/Services.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/ServicesResponse.go b/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
index 0a2868e4df3..52c761e8b60 100644
--- a/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
index 7ca99f6fce7..85b751e5b4c 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeAllRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
index 561d4b9b3f1..0bd73ab160f 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeAllResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
index a09b1f744e9..373d4927ce0 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeListRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
index b7bfabfe2a7..125006e1b8e 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeListResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
index c6b7517e2d7..ac5c19d98a6 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
index 935bd690a1c..a55b36abb63 100644
--- a/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/SetAttributeSingleResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/TransportType.go b/plc4go/protocols/eip/readwrite/model/TransportType.go
index 68c78c3c990..6bd6a0a6b72 100644
--- a/plc4go/protocols/eip/readwrite/model/TransportType.go
+++ b/plc4go/protocols/eip/readwrite/model/TransportType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/TypeId.go b/plc4go/protocols/eip/readwrite/model/TypeId.go
index 79236101f04..20764dbdd8e 100644
--- a/plc4go/protocols/eip/readwrite/model/TypeId.go
+++ b/plc4go/protocols/eip/readwrite/model/TypeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go b/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
index 503a9c5d97f..6c9659fc5b0 100644
--- a/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type UnConnectedDataItemBuilder interface {
 	WithMandatoryFields(service CipService) UnConnectedDataItemBuilder
 	// WithService adds Service (property field)
 	WithService(CipService) UnConnectedDataItemBuilder
-	// WithServiceBuilder adds Service (property field) which is build by the builder
-	WithServiceBuilder(func(CipServiceBuilder) CipServiceBuilder) UnConnectedDataItemBuilder
 	// Build builds the UnConnectedDataItem or returns an error if something is wrong
 	Build() (UnConnectedDataItem, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_UnConnectedDataItemBuilder) WithService(service CipService) UnConnecte
 	return m
 }
 
-func (m *_UnConnectedDataItemBuilder) WithServiceBuilder(builderSupplier func(CipServiceBuilder) CipServiceBuilder) UnConnectedDataItemBuilder {
-	builder := builderSupplier(m.Service.CreateCipServiceBuilder())
-	var err error
-	m.Service, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CipServiceBuilder failed"))
-	}
-	return m
-}
-
 func (m *_UnConnectedDataItemBuilder) Build() (UnConnectedDataItem, error) {
 	if m.Service == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/firmata/readwrite/ParserHelper.go b/plc4go/protocols/firmata/readwrite/ParserHelper.go
index 1c47aac9a8c..502568e29d9 100644
--- a/plc4go/protocols/firmata/readwrite/ParserHelper.go
+++ b/plc4go/protocols/firmata/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/XmlParserHelper.go b/plc4go/protocols/firmata/readwrite/XmlParserHelper.go
index 16209353f25..20391f86a84 100644
--- a/plc4go/protocols/firmata/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/firmata/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
index 1e99a7b8e7f..983fb2153d6 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
index 8e4f1c47464..39544949059 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandProtocolVersion.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
index a8610ecec28..3cbd88ffc61 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
index 0089b0de0b7..14bbf46eb5b 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSetPinMode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
index 448cf9533cf..f722b0f3d86 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSysex.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type FirmataCommandSysexBuilder interface {
 	WithMandatoryFields(command SysexCommand) FirmataCommandSysexBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(SysexCommand) FirmataCommandSysexBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(SysexCommandBuilder) SysexCommandBuilder) FirmataCommandSysexBuilder
 	// Build builds the FirmataCommandSysex or returns an error if something is wrong
 	Build() (FirmataCommandSysex, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_FirmataCommandSysexBuilder) WithCommand(command SysexCommand) FirmataC
 	return m
 }
 
-func (m *_FirmataCommandSysexBuilder) WithCommandBuilder(builderSupplier func(SysexCommandBuilder) SysexCommandBuilder) FirmataCommandSysexBuilder {
-	builder := builderSupplier(m.Command.CreateSysexCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "SysexCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FirmataCommandSysexBuilder) Build() (FirmataCommandSysex, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
index fde16288c8b..1b6a0f118d6 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataCommandSystemReset.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
index c2c198edb1a..9cf31290482 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessage.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
index 31a4e56363d..3dc4e1f9ef9 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageAnalogIO.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
index 00bca726fad..9950dcc611f 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageCommand.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -82,8 +84,6 @@ type FirmataMessageCommandBuilder interface {
 	WithMandatoryFields(command FirmataCommand) FirmataMessageCommandBuilder
 	// WithCommand adds Command (property field)
 	WithCommand(FirmataCommand) FirmataMessageCommandBuilder
-	// WithCommandBuilder adds Command (property field) which is build by the builder
-	WithCommandBuilder(func(FirmataCommandBuilder) FirmataCommandBuilder) FirmataMessageCommandBuilder
 	// Build builds the FirmataMessageCommand or returns an error if something is wrong
 	Build() (FirmataMessageCommand, error)
 	// MustBuild does the same as Build but panics on error
@@ -112,19 +112,6 @@ func (m *_FirmataMessageCommandBuilder) WithCommand(command FirmataCommand) Firm
 	return m
 }
 
-func (m *_FirmataMessageCommandBuilder) WithCommandBuilder(builderSupplier func(FirmataCommandBuilder) FirmataCommandBuilder) FirmataMessageCommandBuilder {
-	builder := builderSupplier(m.Command.CreateFirmataCommandBuilder())
-	var err error
-	m.Command, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "FirmataCommandBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FirmataMessageCommandBuilder) Build() (FirmataMessageCommand, error) {
 	if m.Command == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
index efa9f27a0f7..66981ca5566 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageDigitalIO.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
index f36bb167882..c90ecfc68d4 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
index 96ff39ddabd..2eb72645ef6 100644
--- a/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
+++ b/plc4go/protocols/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/PinMode.go b/plc4go/protocols/firmata/readwrite/model/PinMode.go
index 6b5f93e0f9a..f4cdde4d6e7 100644
--- a/plc4go/protocols/firmata/readwrite/model/PinMode.go
+++ b/plc4go/protocols/firmata/readwrite/model/PinMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommand.go b/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
index 7f2dca4dfcc..33a99c4bf55 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommand.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
index 76b4d36c48a..035c9951e8d 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
index 95bc7951201..6d6977ea36a 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
index e1f9f95154c..71eac41ee30 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityQuery.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityQuery.go
index a36b00c8c60..112df0272ad 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityQuery.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityQuery.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityResponse.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityResponse.go
index cb43e75a6f0..ab0182abaa2 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityResponse.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandCapabilityResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedAnalog.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedAnalog.go
index b9d9d68ec91..fe169b46eb5 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedAnalog.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedAnalog.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedId.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedId.go
index 56bdd744e34..94d559e31d3 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedId.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandExtendedId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateQuery.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateQuery.go
index 2631553e4ea..cfb7bf43a7f 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateQuery.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateQuery.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateResponse.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateResponse.go
index 8b9f13d5a44..d441fb9e8be 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateResponse.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandPinStateResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
index 7c65250cd2f..8181438e829 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
index 873e5219712..0b3d11c686a 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandSamplingInterval.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandSamplingInterval.go
index f8feeaac290..a184803082b 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandSamplingInterval.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandSamplingInterval.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandStringData.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandStringData.go
index efb6fb7bfdb..b85d3e1e31d 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandStringData.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandStringData.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexNonRealtime.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
index d0da492fc58..0dede037260 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexRealtime.go b/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexRealtime.go
index 3715a80bfe1..8fec8193700 100644
--- a/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexRealtime.go
+++ b/plc4go/protocols/firmata/readwrite/model/SysexCommandSysexRealtime.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/ParserHelper.go b/plc4go/protocols/knxnetip/readwrite/ParserHelper.go
index 20a411256a7..81425ec3087 100644
--- a/plc4go/protocols/knxnetip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/knxnetip/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/XmlParserHelper.go b/plc4go/protocols/knxnetip/readwrite/XmlParserHelper.go
index 3aede3f2d7e..57fc337deb5 100644
--- a/plc4go/protocols/knxnetip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/knxnetip/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go b/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
index 16c8f9f498f..5856e2c92fb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/AccessLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/Apdu.go b/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
index 5c29e99d836..17908ab2e57 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/Apdu.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
index 00d03006304..ed5edf8f894 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControl.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlAck.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlAck.go
index 5c169eb64bd..a0e1c0d6fb3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlAck.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlAck.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlConnect.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlConnect.go
index 9fa75ca4c43..715b3bf3d85 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlConnect.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlConnect.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
index 621fc154fa1..b5d1eaf724a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlContainer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type ApduControlContainerBuilder interface {
 	WithMandatoryFields(controlApdu ApduControl) ApduControlContainerBuilder
 	// WithControlApdu adds ControlApdu (property field)
 	WithControlApdu(ApduControl) ApduControlContainerBuilder
-	// WithControlApduBuilder adds ControlApdu (property field) which is build by the builder
-	WithControlApduBuilder(func(ApduControlBuilder) ApduControlBuilder) ApduControlContainerBuilder
 	// Build builds the ApduControlContainer or returns an error if something is wrong
 	Build() (ApduControlContainer, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_ApduControlContainerBuilder) WithControlApdu(controlApdu ApduControl)
 	return m
 }
 
-func (m *_ApduControlContainerBuilder) WithControlApduBuilder(builderSupplier func(ApduControlBuilder) ApduControlBuilder) ApduControlContainerBuilder {
-	builder := builderSupplier(m.ControlApdu.CreateApduControlBuilder())
-	var err error
-	m.ControlApdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ApduControlBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ApduControlContainerBuilder) Build() (ApduControlContainer, error) {
 	if m.ControlApdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlDisconnect.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlDisconnect.go
index 186fdd7f31a..19db4e313d0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlDisconnect.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlDisconnect.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduControlNack.go b/plc4go/protocols/knxnetip/readwrite/model/ApduControlNack.go
index 0e230d4b7b5..0b8181bf49e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduControlNack.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduControlNack.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduData.go b/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
index 35e89d819f0..556728f3076 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
index d9e588395df..e4b0a7b44aa 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
index 958f6f5a11c..44450d8777a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataAdcResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
index e20534392da..3cb5f70e28e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataContainer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type ApduDataContainerBuilder interface {
 	WithMandatoryFields(dataApdu ApduData) ApduDataContainerBuilder
 	// WithDataApdu adds DataApdu (property field)
 	WithDataApdu(ApduData) ApduDataContainerBuilder
-	// WithDataApduBuilder adds DataApdu (property field) which is build by the builder
-	WithDataApduBuilder(func(ApduDataBuilder) ApduDataBuilder) ApduDataContainerBuilder
 	// Build builds the ApduDataContainer or returns an error if something is wrong
 	Build() (ApduDataContainer, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_ApduDataContainerBuilder) WithDataApdu(dataApdu ApduData) ApduDataCont
 	return m
 }
 
-func (m *_ApduDataContainerBuilder) WithDataApduBuilder(builderSupplier func(ApduDataBuilder) ApduDataBuilder) ApduDataContainerBuilder {
-	builder := builderSupplier(m.DataApdu.CreateApduDataBuilder())
-	var err error
-	m.DataApdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ApduDataBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ApduDataContainerBuilder) Build() (ApduDataContainer, error) {
 	if m.DataApdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
index 15c8fc06a2b..9af08ddd033 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index 881c0b55d2b..1e326b200f0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
index e7eb6827f55..eb13348e20f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExt.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
index 6b0b521baf2..15a4beebb3b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
index dc4efa8aa56..c280bb50537 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
index 5adfc1f15ae..98fcfc73d15 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
index dbef64785e5..e4cad32eb41 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
index c6eb33d6fdf..efe9e89feb3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
index 0c93a29559b..7f7c811bcbb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
index f327ba7f412..9d8d307d465 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
index 384285c3f46..63940a26aeb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
index 528d5b7780b..49e94f3570d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
index a4d179e01aa..168a468d508 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
index f8353a338d2..f2da09e35e7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
index cb7483d6905..96b7bd251f9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
index 453e39ce9c5..c5712cc9932 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
index 77f5fa26c4a..07ff629f8c5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
index 245efbc0617..46ce2777eea 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
index 46a86d51cb4..358ef340e5a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
index 7899952b29a..8e92f979e09 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
index 2683a39ae43..fe42efaa9a1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
index 2b2d23c1207..81b28505266 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
index f43691f2d39..e62b5c6f205 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
index 6b5fcdb2545..3948b96179c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
index 81a0aea1224..5e21de3ca98 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
index 5dcc4d40960..e3cd4765b7d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
index 5bb7be395d8..d05b3edacbb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
index 5455684f43e..6368b9222fd 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
index 0d00e825eaf..2b72270e54e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
index a314498e11a..0a3f9cd7508 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
index afd664c6dff..bbdca6bbc70 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
index 4aa9e01fecd..86a54ce1eaf 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
index dbb4563af83..1953ed74459 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index b41fd3d9b56..c85ea905a95 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index 797c702233c..89df9e5d8a3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
index 575e6f9ac73..0056d69e82d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
index 7beef59cb99..7b2e5110cf2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
index 470e1c9b282..5aa3109e964 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
index d31b4284018..6fd1ab0840e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
index bcaa20d54f9..7127bbca094 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
index b573b34aae7..7871eb9fcff 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
index 63607b8c376..d6374288df7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
index 855541fcf78..bf2d70a6091 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
index 3eaf5b81a7b..e95a6883035 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
index d0f901363a3..eac9b6b7bca 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index 2f18f05ae6a..c8e5a2af91f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index 40f2e33001b..5faa36169f7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
index 27bbd353ff1..a91860be681 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
index f178e879512..53ea0329706 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
index a94e726a387..ab12ae3dbd8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
index ef48b381257..28c4d068bac 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryRead.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
index bd69a4d09b3..77201d74153 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
index 2e0183540c1..fc667f2f0c7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataMemoryWrite.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
index 9c7240ada84..c06a08770d9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataOther.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type ApduDataOtherBuilder interface {
 	WithMandatoryFields(extendedApdu ApduDataExt) ApduDataOtherBuilder
 	// WithExtendedApdu adds ExtendedApdu (property field)
 	WithExtendedApdu(ApduDataExt) ApduDataOtherBuilder
-	// WithExtendedApduBuilder adds ExtendedApdu (property field) which is build by the builder
-	WithExtendedApduBuilder(func(ApduDataExtBuilder) ApduDataExtBuilder) ApduDataOtherBuilder
 	// Build builds the ApduDataOther or returns an error if something is wrong
 	Build() (ApduDataOther, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_ApduDataOtherBuilder) WithExtendedApdu(extendedApdu ApduDataExt) ApduD
 	return m
 }
 
-func (m *_ApduDataOtherBuilder) WithExtendedApduBuilder(builderSupplier func(ApduDataExtBuilder) ApduDataExtBuilder) ApduDataOtherBuilder {
-	builder := builderSupplier(m.ExtendedApdu.CreateApduDataExtBuilder())
-	var err error
-	m.ExtendedApdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ApduDataExtBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ApduDataOtherBuilder) Build() (ApduDataOther, error) {
 	if m.ExtendedApdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
index 209b1d02504..a3df5d812b3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataRestart.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go b/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
index 2932eae7ea5..97dcb235374 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ApduDataUserMessage.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMI.go b/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
index a1cae31b47f..10d8f4f77f8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMI.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
index e77d3810481..4cf2cdccc76 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
index be22dfad40e..65e6efb5235 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
index 50c75ce9e13..ed0c426b95b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go b/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
index 61e1234fa23..23491b46ae8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/CEMIPriority.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go b/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
index 801d21d34c7..619c0be1269 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ChannelInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
index 4ebabb913bf..8a88a9340c5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTable.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
index 8245fcff5b2..d741d18c150 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableAddresses.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType1.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
index 184d3f4f9a1..a84d0832381 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType2.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
index 36eee65eea5..8021e3609e7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType6.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
index a187158f913..f636e699c80 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go b/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
index 4c2a8046cb3..cb7346468dd 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ComObjectValueType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequest.go
index c18bce12505..a89ec7b714f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -104,8 +106,6 @@ type ConnectionRequestBuilder interface {
 	WithHpaiDataEndpointBuilder(func(HPAIDataEndpointBuilder) HPAIDataEndpointBuilder) ConnectionRequestBuilder
 	// WithConnectionRequestInformation adds ConnectionRequestInformation (property field)
 	WithConnectionRequestInformation(ConnectionRequestInformation) ConnectionRequestBuilder
-	// WithConnectionRequestInformationBuilder adds ConnectionRequestInformation (property field) which is build by the builder
-	WithConnectionRequestInformationBuilder(func(ConnectionRequestInformationBuilder) ConnectionRequestInformationBuilder) ConnectionRequestBuilder
 	// Build builds the ConnectionRequest or returns an error if something is wrong
 	Build() (ConnectionRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -170,19 +170,6 @@ func (m *_ConnectionRequestBuilder) WithConnectionRequestInformation(connectionR
 	return m
 }
 
-func (m *_ConnectionRequestBuilder) WithConnectionRequestInformationBuilder(builderSupplier func(ConnectionRequestInformationBuilder) ConnectionRequestInformationBuilder) ConnectionRequestBuilder {
-	builder := builderSupplier(m.ConnectionRequestInformation.CreateConnectionRequestInformationBuilder())
-	var err error
-	m.ConnectionRequestInformation, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ConnectionRequestInformationBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ConnectionRequestBuilder) Build() (ConnectionRequest, error) {
 	if m.HpaiDiscoveryEndpoint == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
index a7667d01893..2ef69aec4e6 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
index 8847f66f8f8..ac45b9deabf 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
index 30cf9fd6ccf..c8fb4d2365b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
index 8caed052a9b..afa687edb90 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -99,8 +101,6 @@ type ConnectionResponseBuilder interface {
 	WithOptionalHpaiDataEndpointBuilder(func(HPAIDataEndpointBuilder) HPAIDataEndpointBuilder) ConnectionResponseBuilder
 	// WithConnectionResponseDataBlock adds ConnectionResponseDataBlock (property field)
 	WithOptionalConnectionResponseDataBlock(ConnectionResponseDataBlock) ConnectionResponseBuilder
-	// WithOptionalConnectionResponseDataBlockBuilder adds ConnectionResponseDataBlock (property field) which is build by the builder
-	WithOptionalConnectionResponseDataBlockBuilder(func(ConnectionResponseDataBlockBuilder) ConnectionResponseDataBlockBuilder) ConnectionResponseBuilder
 	// Build builds the ConnectionResponse or returns an error if something is wrong
 	Build() (ConnectionResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -157,19 +157,6 @@ func (m *_ConnectionResponseBuilder) WithOptionalConnectionResponseDataBlock(con
 	return m
 }
 
-func (m *_ConnectionResponseBuilder) WithOptionalConnectionResponseDataBlockBuilder(builderSupplier func(ConnectionResponseDataBlockBuilder) ConnectionResponseDataBlockBuilder) ConnectionResponseBuilder {
-	builder := builderSupplier(m.ConnectionResponseDataBlock.CreateConnectionResponseDataBlockBuilder())
-	var err error
-	m.ConnectionResponseDataBlock, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ConnectionResponseDataBlockBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ConnectionResponseBuilder) Build() (ConnectionResponse, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
index d7f166ee7c5..24f34e2ffa8 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
index 78dce6d596c..cb4dd835d65 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
index 651a9d17ec9..6cf311e50fb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
index 3606dbc213b..594e06f2fed 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateResponse.go b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateResponse.go
index 4e6aaa2d899..e709d8e5465 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ConnectionStateResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go b/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
index 66ab1a175b1..4a6b3b6c558 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DIBDeviceInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go b/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
index 37717bf7af0..fd2625abc59 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DescriptionRequest.go b/plc4go/protocols/knxnetip/readwrite/model/DescriptionRequest.go
index e6b863ac299..ec00f5ee5a1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DescriptionRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DescriptionRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DescriptionResponse.go b/plc4go/protocols/knxnetip/readwrite/model/DescriptionResponse.go
index 8ffac534b0d..73448b47196 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DescriptionResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DescriptionResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAck.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAck.go
index 2f58d887291..6013fc392c4 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAck.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAck.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
index a24080f565a..ce3269d471f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index b4f85cd4461..3577189339f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type DeviceConfigurationRequestBuilder interface {
 	WithDeviceConfigurationRequestDataBlockBuilder(func(DeviceConfigurationRequestDataBlockBuilder) DeviceConfigurationRequestDataBlockBuilder) DeviceConfigurationRequestBuilder
 	// WithCemi adds Cemi (property field)
 	WithCemi(CEMI) DeviceConfigurationRequestBuilder
-	// WithCemiBuilder adds Cemi (property field) which is build by the builder
-	WithCemiBuilder(func(CEMIBuilder) CEMIBuilder) DeviceConfigurationRequestBuilder
 	// Build builds the DeviceConfigurationRequest or returns an error if something is wrong
 	Build() (DeviceConfigurationRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -144,19 +144,6 @@ func (m *_DeviceConfigurationRequestBuilder) WithCemi(cemi CEMI) DeviceConfigura
 	return m
 }
 
-func (m *_DeviceConfigurationRequestBuilder) WithCemiBuilder(builderSupplier func(CEMIBuilder) CEMIBuilder) DeviceConfigurationRequestBuilder {
-	builder := builderSupplier(m.Cemi.CreateCEMIBuilder())
-	var err error
-	m.Cemi, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CEMIBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeviceConfigurationRequestBuilder) Build() (DeviceConfigurationRequest, error) {
 	if m.DeviceConfigurationRequestDataBlock == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
index c42f76b7ef5..16180d3b222 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
index 2f25991a75b..7492c13e891 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptor.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
index 078c78c561c..a5cab5e21fc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
index 7ab12c54dc6..46de646bcae 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceDescriptorType2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
index 63ebb7ff108..d0d85627c1c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DeviceStatus.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go b/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
index c652151e1c7..048a3f61fbb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DisconnectRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/DisconnectResponse.go b/plc4go/protocols/knxnetip/readwrite/model/DisconnectResponse.go
index df5766a01aa..ca7f85edfe1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/DisconnectResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/DisconnectResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go b/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
index eb0321547b7..233bf2b84fd 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/FirmwareType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
index 136d5dde5ec..5ea6d69d5a9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
index 16326b659a2..145931080b6 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
index 2b864f743c6..a9ceec1142d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType6.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
index fe12df959ea..8a3c0f85844 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
index c2bc80a6e65..6598499721e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
index 8fc4428e4ec..657f10ef85f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIControlEndpoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
index 0db643c4f71..96182852f50 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIDataEndpoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go b/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
index b14b42643b6..0728ef70e4d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go b/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
index bd74fd2d0be..89dffe58b0c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/HostProtocolCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go b/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
index 0fee2eb6d28..05ee89c6962 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/IPAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go b/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
index af92efdff3e..08ed7a118ac 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
index 0af3b9e67e2..31231eccdfd 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
index 29c15a41f00..5cf200d28f2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointMainType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
index e60e71a3864..60444524cae 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
index 2a053a74c9a..8bb53af1cfe 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress2Level.go b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress2Level.go
index 57e153bf044..21308b6a675 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress2Level.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress2Level.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress3Level.go b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress3Level.go
index 72b3636d4f1..37e8eedff0b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress3Level.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddress3Level.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
index 5d628e81abd..f39a3101405 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
index ddae55e0fe8..af46ad65b3c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectProperty.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
index 642e0815f5d..dd083031727 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxInterfaceObjectType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
index e8f8970e31f..10b1b14443b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxLayer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 796bcc081db..76e093de07f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go b/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
index 3bc1b6e7f66..eefe0d7a4cc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxMedium.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpCore.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpCore.go
index c14b9bcbe56..83d0a65941e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpCore.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpCore.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
index e8c7af795c2..3c935e02833 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
index 8c21cd32987..84f17c8c096 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpMessage.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpRouting.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpRouting.go
index 381eeecdd8e..db7b26c3208 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpRouting.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpRouting.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpTunneling.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpTunneling.go
index 43162a1f4a4..d70cebe8f44 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpTunneling.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetIpTunneling.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetObjectServer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetObjectServer.go
index b46dcc85bf7..74c62d89636 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetObjectServer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetObjectServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
index 008f76c578c..cd56763be7b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteLogging.go b/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteLogging.go
index 361c8e70eab..7673a9b3004 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteLogging.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxNetRemoteLogging.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go b/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
index d384842efb7..df68a5063af 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxProperty.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
index cbcab53c3e6..4d451ff7def 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxPropertyDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go b/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
index 227b1a40d38..04fe5c2fc6a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LBusmonInd.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type LBusmonIndBuilder interface {
 	WithAdditionalInformation(...CEMIAdditionalInformation) LBusmonIndBuilder
 	// WithDataFrame adds DataFrame (property field)
 	WithDataFrame(LDataFrame) LBusmonIndBuilder
-	// WithDataFrameBuilder adds DataFrame (property field) which is build by the builder
-	WithDataFrameBuilder(func(LDataFrameBuilder) LDataFrameBuilder) LBusmonIndBuilder
 	// WithCrc adds Crc (property field)
 	WithOptionalCrc(uint8) LBusmonIndBuilder
 	// Build builds the LBusmonInd or returns an error if something is wrong
@@ -138,19 +138,6 @@ func (m *_LBusmonIndBuilder) WithDataFrame(dataFrame LDataFrame) LBusmonIndBuild
 	return m
 }
 
-func (m *_LBusmonIndBuilder) WithDataFrameBuilder(builderSupplier func(LDataFrameBuilder) LDataFrameBuilder) LBusmonIndBuilder {
-	builder := builderSupplier(m.DataFrame.CreateLDataFrameBuilder())
-	var err error
-	m.DataFrame, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LDataFrameBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LBusmonIndBuilder) WithOptionalCrc(crc uint8) LBusmonIndBuilder {
 	m.Crc = &crc
 	return m
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go b/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
index 80482543550..5899d6e7d96 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataCon.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type LDataConBuilder interface {
 	WithAdditionalInformation(...CEMIAdditionalInformation) LDataConBuilder
 	// WithDataFrame adds DataFrame (property field)
 	WithDataFrame(LDataFrame) LDataConBuilder
-	// WithDataFrameBuilder adds DataFrame (property field) which is build by the builder
-	WithDataFrameBuilder(func(LDataFrameBuilder) LDataFrameBuilder) LDataConBuilder
 	// Build builds the LDataCon or returns an error if something is wrong
 	Build() (LDataCon, error)
 	// MustBuild does the same as Build but panics on error
@@ -132,19 +132,6 @@ func (m *_LDataConBuilder) WithDataFrame(dataFrame LDataFrame) LDataConBuilder {
 	return m
 }
 
-func (m *_LDataConBuilder) WithDataFrameBuilder(builderSupplier func(LDataFrameBuilder) LDataFrameBuilder) LDataConBuilder {
-	builder := builderSupplier(m.DataFrame.CreateLDataFrameBuilder())
-	var err error
-	m.DataFrame, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LDataFrameBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LDataConBuilder) Build() (LDataCon, error) {
 	if m.DataFrame == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataExtended.go b/plc4go/protocols/knxnetip/readwrite/model/LDataExtended.go
index bca28e53f67..4c6de15bd77 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataExtended.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataExtended.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -115,8 +117,6 @@ type LDataExtendedBuilder interface {
 	WithDestinationAddress(...byte) LDataExtendedBuilder
 	// WithApdu adds Apdu (property field)
 	WithApdu(Apdu) LDataExtendedBuilder
-	// WithApduBuilder adds Apdu (property field) which is build by the builder
-	WithApduBuilder(func(ApduBuilder) ApduBuilder) LDataExtendedBuilder
 	// Build builds the LDataExtended or returns an error if something is wrong
 	Build() (LDataExtended, error)
 	// MustBuild does the same as Build but panics on error
@@ -183,19 +183,6 @@ func (m *_LDataExtendedBuilder) WithApdu(apdu Apdu) LDataExtendedBuilder {
 	return m
 }
 
-func (m *_LDataExtendedBuilder) WithApduBuilder(builderSupplier func(ApduBuilder) ApduBuilder) LDataExtendedBuilder {
-	builder := builderSupplier(m.Apdu.CreateApduBuilder())
-	var err error
-	m.Apdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ApduBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LDataExtendedBuilder) Build() (LDataExtended, error) {
 	if m.SourceAddress == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go b/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
index 435d2aba859..ed15bd8411a 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataFrame.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataFrameACK.go b/plc4go/protocols/knxnetip/readwrite/model/LDataFrameACK.go
index 572dd4d180d..5a1c46ec49d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataFrameACK.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataFrameACK.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go b/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
index 8109c9c12cb..771445008d0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataInd.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type LDataIndBuilder interface {
 	WithAdditionalInformation(...CEMIAdditionalInformation) LDataIndBuilder
 	// WithDataFrame adds DataFrame (property field)
 	WithDataFrame(LDataFrame) LDataIndBuilder
-	// WithDataFrameBuilder adds DataFrame (property field) which is build by the builder
-	WithDataFrameBuilder(func(LDataFrameBuilder) LDataFrameBuilder) LDataIndBuilder
 	// Build builds the LDataInd or returns an error if something is wrong
 	Build() (LDataInd, error)
 	// MustBuild does the same as Build but panics on error
@@ -132,19 +132,6 @@ func (m *_LDataIndBuilder) WithDataFrame(dataFrame LDataFrame) LDataIndBuilder {
 	return m
 }
 
-func (m *_LDataIndBuilder) WithDataFrameBuilder(builderSupplier func(LDataFrameBuilder) LDataFrameBuilder) LDataIndBuilder {
-	builder := builderSupplier(m.DataFrame.CreateLDataFrameBuilder())
-	var err error
-	m.DataFrame, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LDataFrameBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LDataIndBuilder) Build() (LDataInd, error) {
 	if m.DataFrame == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go b/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
index d375f620737..8edd2e9054b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LDataReq.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type LDataReqBuilder interface {
 	WithAdditionalInformation(...CEMIAdditionalInformation) LDataReqBuilder
 	// WithDataFrame adds DataFrame (property field)
 	WithDataFrame(LDataFrame) LDataReqBuilder
-	// WithDataFrameBuilder adds DataFrame (property field) which is build by the builder
-	WithDataFrameBuilder(func(LDataFrameBuilder) LDataFrameBuilder) LDataReqBuilder
 	// Build builds the LDataReq or returns an error if something is wrong
 	Build() (LDataReq, error)
 	// MustBuild does the same as Build but panics on error
@@ -132,19 +132,6 @@ func (m *_LDataReqBuilder) WithDataFrame(dataFrame LDataFrame) LDataReqBuilder {
 	return m
 }
 
-func (m *_LDataReqBuilder) WithDataFrameBuilder(builderSupplier func(LDataFrameBuilder) LDataFrameBuilder) LDataReqBuilder {
-	builder := builderSupplier(m.DataFrame.CreateLDataFrameBuilder())
-	var err error
-	m.DataFrame, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "LDataFrameBuilder failed"))
-	}
-	return m
-}
-
 func (m *_LDataReqBuilder) Build() (LDataReq, error) {
 	if m.DataFrame == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollData.go b/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
index 5b0fbcd9473..6d0c2261cb0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go b/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
index 4174508270a..ff05f4d93d2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollDataCon.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go b/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
index f7b24b02baa..3fe2027f0bc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LPollDataReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go b/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
index 0b8c5f3e264..9dbbc5e1b9d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawCon.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go b/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
index 2faaa6870ac..b3aa1059d48 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawInd.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go b/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
index de57035bdca..947d1dee5c5 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/LRawReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go b/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
index 631df051098..bb16be719b1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MACAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
index 819e32ef734..fd4f88e1358 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCommandReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
index f90ed2e7ad8..a8d11006dbc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropCon.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
index c5f9e558f2a..8c0a4ae789d 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MFuncPropStateReadReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go b/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
index 24b633f8825..c0bceee8717 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropInfoInd.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go b/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
index 858bb233c45..1993fe4cab9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropReadCon.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go b/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
index 1ff7e22d2da..1abdda6525f 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropReadReq.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
index 8a7d164d45f..5d1f99e454b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteCon.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
index ed62778c813..be3948764eb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MPropWriteReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go b/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
index a26771e06fe..79a2852ae90 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MResetInd.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go b/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
index be7c5b0930a..fdd604c714b 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/MResetReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go b/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
index db69900eeca..831a9bc91af 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go b/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
index 955db0bc451..b9b7f4e01b9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/RelativeTimestamp.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/RoutingIndication.go b/plc4go/protocols/knxnetip/readwrite/model/RoutingIndication.go
index 4c46a54ee7c..f81fe3dd312 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/RoutingIndication.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/RoutingIndication.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/SearchRequest.go b/plc4go/protocols/knxnetip/readwrite/model/SearchRequest.go
index b8b26b662b8..9267301f2ac 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/SearchRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/SearchRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/SearchResponse.go b/plc4go/protocols/knxnetip/readwrite/model/SearchResponse.go
index c57dea5a157..6900aa4abf0 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/SearchResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/SearchResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go b/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
index 0ae260a7da2..72079e91f14 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/ServiceId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/Status.go b/plc4go/protocols/knxnetip/readwrite/model/Status.go
index 706689b3cc0..d23db5f171c 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/Status.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/Status.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go b/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
index e35e3da7f34..504beca71d2 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/SupportedPhysicalMedia.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
index 042642c54fd..2e32e6ed7bc 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedInd.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
index c3b7b96e5f2..126fc100eb7 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataConnectedReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
index cdc670bfcbb..0b7f72be1ee 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualInd.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
index 4a9753742b4..be761694448 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TDataIndividualReq.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
index d8d23bba1dd..ceb58e7ae30 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequest.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type TunnelingRequestBuilder interface {
 	WithTunnelingRequestDataBlockBuilder(func(TunnelingRequestDataBlockBuilder) TunnelingRequestDataBlockBuilder) TunnelingRequestBuilder
 	// WithCemi adds Cemi (property field)
 	WithCemi(CEMI) TunnelingRequestBuilder
-	// WithCemiBuilder adds Cemi (property field) which is build by the builder
-	WithCemiBuilder(func(CEMIBuilder) CEMIBuilder) TunnelingRequestBuilder
 	// Build builds the TunnelingRequest or returns an error if something is wrong
 	Build() (TunnelingRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -144,19 +144,6 @@ func (m *_TunnelingRequestBuilder) WithCemi(cemi CEMI) TunnelingRequestBuilder {
 	return m
 }
 
-func (m *_TunnelingRequestBuilder) WithCemiBuilder(builderSupplier func(CEMIBuilder) CEMIBuilder) TunnelingRequestBuilder {
-	builder := builderSupplier(m.Cemi.CreateCEMIBuilder())
-	var err error
-	m.Cemi, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "CEMIBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TunnelingRequestBuilder) Build() (TunnelingRequest, error) {
 	if m.TunnelingRequestDataBlock == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
index 4a2c1062b80..a6c757a68c1 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponse.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponse.go
index 9fe5fd0efef..090c7d357a3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponse.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponse.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
index f617f5840c9..6afa6c1f3a3 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
index 592f65bd376..5b1bdba4e8e 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/UnknownMessage.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/ParserHelper.go b/plc4go/protocols/modbus/readwrite/ParserHelper.go
index 81261b0e689..ca635441019 100644
--- a/plc4go/protocols/modbus/readwrite/ParserHelper.go
+++ b/plc4go/protocols/modbus/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/XmlParserHelper.go b/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
index 79333147ff5..a9a6bda66fe 100644
--- a/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/modbus/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/DataItem.go b/plc4go/protocols/modbus/readwrite/model/DataItem.go
index 2104b536e2c..017a02d2b2c 100644
--- a/plc4go/protocols/modbus/readwrite/model/DataItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/DataItem.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/DriverType.go b/plc4go/protocols/modbus/readwrite/model/DriverType.go
index 88162172a08..a4b6a038b21 100644
--- a/plc4go/protocols/modbus/readwrite/model/DriverType.go
+++ b/plc4go/protocols/modbus/readwrite/model/DriverType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
index 9a422c68c0b..eac39b466b4 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusADU.go
@@ -23,9 +23,11 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
index 88e7d697467..ab75a506dc2 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusAsciiADU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type ModbusAsciiADUBuilder interface {
 	WithAddress(uint8) ModbusAsciiADUBuilder
 	// WithPdu adds Pdu (property field)
 	WithPdu(ModbusPDU) ModbusAsciiADUBuilder
-	// WithPduBuilder adds Pdu (property field) which is build by the builder
-	WithPduBuilder(func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusAsciiADUBuilder
 	// Build builds the ModbusAsciiADU or returns an error if something is wrong
 	Build() (ModbusAsciiADU, error)
 	// MustBuild does the same as Build but panics on error
@@ -123,19 +123,6 @@ func (m *_ModbusAsciiADUBuilder) WithPdu(pdu ModbusPDU) ModbusAsciiADUBuilder {
 	return m
 }
 
-func (m *_ModbusAsciiADUBuilder) WithPduBuilder(builderSupplier func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusAsciiADUBuilder {
-	builder := builderSupplier(m.Pdu.CreateModbusPDUBuilder())
-	var err error
-	m.Pdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ModbusPDUBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModbusAsciiADUBuilder) Build() (ModbusAsciiADU, error) {
 	if m.Pdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusConstants.go b/plc4go/protocols/modbus/readwrite/model/ModbusConstants.go
index f24bbf52c23..b98dc83740d 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusConstants.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go b/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
index d2eb0c2a80b..95d4881de42 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
index 30b1f7fa5da..976b11c5f7b 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationConformityLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
index e624514a139..fdf79ab2774 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
index fe71206f77a..ded2a165cb6 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationMoreFollows.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
index 15d65720bbf..266547e5589 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusDeviceInformationObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go b/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
index 673eb9f4c92..34f423378bf 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusErrorCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
index 5444a6aaa53..70f26896a10 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDU.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
index c9ecddd1d8e..100d094aeb5 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
index 7b327ca8301..6281a653252 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUError.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUError.go
index d8d7b7908ac..ed9e431d98d 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUError.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
index 3a7b88ee590..8cf40e002fa 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
index 71a21e138dd..5e0d297b560 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
index d11f7eb9aa5..d3c7551e81a 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
index f22beecb99f..3f5386a94b1 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
index 9baa5050108..48380260b33 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
index 15d96517544..2034e0b28ca 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
index 83acfc87c9f..6da35360208 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
index 967d1bcc086..f7121b36160 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
index 99768e224e3..f7b9e48de14 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
index a6a28bfba63..c4038693f18 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
index 7c1b7c419ac..d0b1a7e46b2 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
index b4ae00d880a..01ae4af65b8 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
index bca1697968f..f88ffb51578 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
index 25308527f05..52b5a760973 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
index e4821b70ddc..2f0d389966c 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
index a07b2040b71..693e08ce159 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
index 68564c2a710..e2b0624fd38 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
index 977e26979ab..d58af354d4b 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
index 24823009fe4..ee6791b607c 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
index bc578fbea12..c2161d96d00 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
index 9e4fa1ee0d6..82c3b9ecca9 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
index f14876620eb..ab31d8451aa 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
index 5d73208321c..21fcaed3282 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
index 668f31c341f..e5fc054efa4 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
index 8ef163340fb..13b3f20d64a 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
index 472293048f1..60324f0bea5 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
index 45aeea01b28..829bbd4d847 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
index 70275af4028..376c27d2458 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
index 76d138a0050..af1ce7ed70d 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
index 3bd98abdc1e..6232c3cc521 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
index 34dd1337636..ddd64b22f8b 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
index 8b5f6c9ddf2..ccf54f0d00f 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
index f7e05210cd6..03aebcae951 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
index d1e7e29faee..9f9197cc58e 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
index 717de6c7173..02f0166df19 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
index 93b0ae0eb14..d73f62ab010 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
index deed8319f05..691769ec7ec 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
index 78d3fd1930a..718a6377af5 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
index ba131ecc5c1..17f33aca457 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
index 74d7198760b..cca72ccb640 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
index 965ea6d9b89..9fa9ad97a49 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusRtuADU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type ModbusRtuADUBuilder interface {
 	WithAddress(uint8) ModbusRtuADUBuilder
 	// WithPdu adds Pdu (property field)
 	WithPdu(ModbusPDU) ModbusRtuADUBuilder
-	// WithPduBuilder adds Pdu (property field) which is build by the builder
-	WithPduBuilder(func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusRtuADUBuilder
 	// Build builds the ModbusRtuADU or returns an error if something is wrong
 	Build() (ModbusRtuADU, error)
 	// MustBuild does the same as Build but panics on error
@@ -123,19 +123,6 @@ func (m *_ModbusRtuADUBuilder) WithPdu(pdu ModbusPDU) ModbusRtuADUBuilder {
 	return m
 }
 
-func (m *_ModbusRtuADUBuilder) WithPduBuilder(builderSupplier func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusRtuADUBuilder {
-	builder := builderSupplier(m.Pdu.CreateModbusPDUBuilder())
-	var err error
-	m.Pdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ModbusPDUBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModbusRtuADUBuilder) Build() (ModbusRtuADU, error) {
 	if m.Pdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go b/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
index 512dc143b21..790a5f0dd6f 100644
--- a/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
+++ b/plc4go/protocols/modbus/readwrite/model/ModbusTcpADU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -97,8 +99,6 @@ type ModbusTcpADUBuilder interface {
 	WithUnitIdentifier(uint8) ModbusTcpADUBuilder
 	// WithPdu adds Pdu (property field)
 	WithPdu(ModbusPDU) ModbusTcpADUBuilder
-	// WithPduBuilder adds Pdu (property field) which is build by the builder
-	WithPduBuilder(func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusTcpADUBuilder
 	// Build builds the ModbusTcpADU or returns an error if something is wrong
 	Build() (ModbusTcpADU, error)
 	// MustBuild does the same as Build but panics on error
@@ -137,19 +137,6 @@ func (m *_ModbusTcpADUBuilder) WithPdu(pdu ModbusPDU) ModbusTcpADUBuilder {
 	return m
 }
 
-func (m *_ModbusTcpADUBuilder) WithPduBuilder(builderSupplier func(ModbusPDUBuilder) ModbusPDUBuilder) ModbusTcpADUBuilder {
-	builder := builderSupplier(m.Pdu.CreateModbusPDUBuilder())
-	var err error
-	m.Pdu, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ModbusPDUBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModbusTcpADUBuilder) Build() (ModbusTcpADU, error) {
 	if m.Pdu == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/ParserHelper.go b/plc4go/protocols/opcua/readwrite/ParserHelper.go
index c12d845488b..1044aa72f12 100644
--- a/plc4go/protocols/opcua/readwrite/ParserHelper.go
+++ b/plc4go/protocols/opcua/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/XmlParserHelper.go b/plc4go/protocols/opcua/readwrite/XmlParserHelper.go
index 85de819dad1..5e6178b5965 100644
--- a/plc4go/protocols/opcua/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/opcua/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AccessLevelExType.go b/plc4go/protocols/opcua/readwrite/model/AccessLevelExType.go
index e7f736407bc..6b01e533282 100644
--- a/plc4go/protocols/opcua/readwrite/model/AccessLevelExType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AccessLevelExType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AccessLevelType.go b/plc4go/protocols/opcua/readwrite/model/AccessLevelType.go
index 3ac0f71f638..f5f38fd4750 100644
--- a/plc4go/protocols/opcua/readwrite/model/AccessLevelType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AccessLevelType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AccessRestrictionType.go b/plc4go/protocols/opcua/readwrite/model/AccessRestrictionType.go
index 53568308d31..8c0839fe6de 100644
--- a/plc4go/protocols/opcua/readwrite/model/AccessRestrictionType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AccessRestrictionType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ActivateSessionRequest.go b/plc4go/protocols/opcua/readwrite/model/ActivateSessionRequest.go
index be6d1212856..d17bd9b5591 100644
--- a/plc4go/protocols/opcua/readwrite/model/ActivateSessionRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/ActivateSessionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -117,12 +119,8 @@ type ActivateSessionRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, clientSignature ExtensionObjectDefinition, noOfClientSoftwareCertificates int32, clientSoftwareCertificates []ExtensionObjectDefinition, noOfLocaleIds int32, localeIds []PascalString, userIdentityToken ExtensionObject, userTokenSignature ExtensionObjectDefinition) ActivateSessionRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) ActivateSessionRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder
 	// WithClientSignature adds ClientSignature (property field)
 	WithClientSignature(ExtensionObjectDefinition) ActivateSessionRequestBuilder
-	// WithClientSignatureBuilder adds ClientSignature (property field) which is build by the builder
-	WithClientSignatureBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder
 	// WithNoOfClientSoftwareCertificates adds NoOfClientSoftwareCertificates (property field)
 	WithNoOfClientSoftwareCertificates(int32) ActivateSessionRequestBuilder
 	// WithClientSoftwareCertificates adds ClientSoftwareCertificates (property field)
@@ -137,8 +135,6 @@ type ActivateSessionRequestBuilder interface {
 	WithUserIdentityTokenBuilder(func(ExtensionObjectBuilder) ExtensionObjectBuilder) ActivateSessionRequestBuilder
 	// WithUserTokenSignature adds UserTokenSignature (property field)
 	WithUserTokenSignature(ExtensionObjectDefinition) ActivateSessionRequestBuilder
-	// WithUserTokenSignatureBuilder adds UserTokenSignature (property field) which is build by the builder
-	WithUserTokenSignatureBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder
 	// Build builds the ActivateSessionRequest or returns an error if something is wrong
 	Build() (ActivateSessionRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -167,37 +163,11 @@ func (m *_ActivateSessionRequestBuilder) WithRequestHeader(requestHeader Extensi
 	return m
 }
 
-func (m *_ActivateSessionRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ActivateSessionRequestBuilder) WithClientSignature(clientSignature ExtensionObjectDefinition) ActivateSessionRequestBuilder {
 	m.ClientSignature = clientSignature
 	return m
 }
 
-func (m *_ActivateSessionRequestBuilder) WithClientSignatureBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder {
-	builder := builderSupplier(m.ClientSignature.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ClientSignature, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ActivateSessionRequestBuilder) WithNoOfClientSoftwareCertificates(noOfClientSoftwareCertificates int32) ActivateSessionRequestBuilder {
 	m.NoOfClientSoftwareCertificates = noOfClientSoftwareCertificates
 	return m
@@ -241,19 +211,6 @@ func (m *_ActivateSessionRequestBuilder) WithUserTokenSignature(userTokenSignatu
 	return m
 }
 
-func (m *_ActivateSessionRequestBuilder) WithUserTokenSignatureBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionRequestBuilder {
-	builder := builderSupplier(m.UserTokenSignature.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.UserTokenSignature, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ActivateSessionRequestBuilder) Build() (ActivateSessionRequest, error) {
 	if m.RequestHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/ActivateSessionResponse.go b/plc4go/protocols/opcua/readwrite/model/ActivateSessionResponse.go
index 27f149a5b0a..6c741aa8902 100644
--- a/plc4go/protocols/opcua/readwrite/model/ActivateSessionResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/ActivateSessionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -103,8 +105,6 @@ type ActivateSessionResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, serverNonce PascalByteString, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) ActivateSessionResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) ActivateSessionResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionResponseBuilder
 	// WithServerNonce adds ServerNonce (property field)
 	WithServerNonce(PascalByteString) ActivateSessionResponseBuilder
 	// WithServerNonceBuilder adds ServerNonce (property field) which is build by the builder
@@ -145,19 +145,6 @@ func (m *_ActivateSessionResponseBuilder) WithResponseHeader(responseHeader Exte
 	return m
 }
 
-func (m *_ActivateSessionResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ActivateSessionResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ActivateSessionResponseBuilder) WithServerNonce(serverNonce PascalByteString) ActivateSessionResponseBuilder {
 	m.ServerNonce = serverNonce
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AddNodesItem.go b/plc4go/protocols/opcua/readwrite/model/AddNodesItem.go
index 1a4625f28e2..9a2074bab78 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddNodesItem.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddNodesItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AddNodesRequest.go b/plc4go/protocols/opcua/readwrite/model/AddNodesRequest.go
index 5678e66eedb..b231986fbce 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddNodesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddNodesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type AddNodesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfNodesToAdd int32, nodesToAdd []ExtensionObjectDefinition) AddNodesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) AddNodesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddNodesRequestBuilder
 	// WithNoOfNodesToAdd adds NoOfNodesToAdd (property field)
 	WithNoOfNodesToAdd(int32) AddNodesRequestBuilder
 	// WithNodesToAdd adds NodesToAdd (property field)
@@ -122,19 +122,6 @@ func (m *_AddNodesRequestBuilder) WithRequestHeader(requestHeader ExtensionObjec
 	return m
 }
 
-func (m *_AddNodesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddNodesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AddNodesRequestBuilder) WithNoOfNodesToAdd(noOfNodesToAdd int32) AddNodesRequestBuilder {
 	m.NoOfNodesToAdd = noOfNodesToAdd
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AddNodesResponse.go b/plc4go/protocols/opcua/readwrite/model/AddNodesResponse.go
index 1b85b7ac0ac..d5c522d8a5f 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddNodesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddNodesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type AddNodesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) AddNodesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) AddNodesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddNodesResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) AddNodesResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_AddNodesResponseBuilder) WithResponseHeader(responseHeader ExtensionOb
 	return m
 }
 
-func (m *_AddNodesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddNodesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AddNodesResponseBuilder) WithNoOfResults(noOfResults int32) AddNodesResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AddNodesResult.go b/plc4go/protocols/opcua/readwrite/model/AddNodesResult.go
index 75c20bb670b..bdf7c6246b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddNodesResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddNodesResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AddReferencesItem.go b/plc4go/protocols/opcua/readwrite/model/AddReferencesItem.go
index 9c479bb8389..e13fc5b6d7b 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddReferencesItem.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddReferencesItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AddReferencesRequest.go b/plc4go/protocols/opcua/readwrite/model/AddReferencesRequest.go
index 73f1d844317..c52d53ba1a6 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddReferencesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddReferencesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type AddReferencesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfReferencesToAdd int32, referencesToAdd []ExtensionObjectDefinition) AddReferencesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) AddReferencesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddReferencesRequestBuilder
 	// WithNoOfReferencesToAdd adds NoOfReferencesToAdd (property field)
 	WithNoOfReferencesToAdd(int32) AddReferencesRequestBuilder
 	// WithReferencesToAdd adds ReferencesToAdd (property field)
@@ -122,19 +122,6 @@ func (m *_AddReferencesRequestBuilder) WithRequestHeader(requestHeader Extension
 	return m
 }
 
-func (m *_AddReferencesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddReferencesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AddReferencesRequestBuilder) WithNoOfReferencesToAdd(noOfReferencesToAdd int32) AddReferencesRequestBuilder {
 	m.NoOfReferencesToAdd = noOfReferencesToAdd
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AddReferencesResponse.go b/plc4go/protocols/opcua/readwrite/model/AddReferencesResponse.go
index 67f351acb65..b8755758f25 100644
--- a/plc4go/protocols/opcua/readwrite/model/AddReferencesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/AddReferencesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type AddReferencesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) AddReferencesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) AddReferencesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddReferencesResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) AddReferencesResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_AddReferencesResponseBuilder) WithResponseHeader(responseHeader Extens
 	return m
 }
 
-func (m *_AddReferencesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AddReferencesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AddReferencesResponseBuilder) WithNoOfResults(noOfResults int32) AddReferencesResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AdditionalParametersType.go b/plc4go/protocols/opcua/readwrite/model/AdditionalParametersType.go
index 7d60e6b46db..6643f808873 100644
--- a/plc4go/protocols/opcua/readwrite/model/AdditionalParametersType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AdditionalParametersType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AggregateConfiguration.go b/plc4go/protocols/opcua/readwrite/model/AggregateConfiguration.go
index 3f07a3e7424..783346d2d31 100644
--- a/plc4go/protocols/opcua/readwrite/model/AggregateConfiguration.go
+++ b/plc4go/protocols/opcua/readwrite/model/AggregateConfiguration.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AlarmMask.go b/plc4go/protocols/opcua/readwrite/model/AlarmMask.go
index 808cf114803..16c7371f364 100644
--- a/plc4go/protocols/opcua/readwrite/model/AlarmMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/AlarmMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AliasNameDataType.go b/plc4go/protocols/opcua/readwrite/model/AliasNameDataType.go
index 0b6e389a788..e784c20b305 100644
--- a/plc4go/protocols/opcua/readwrite/model/AliasNameDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AliasNameDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Annotation.go b/plc4go/protocols/opcua/readwrite/model/Annotation.go
index 8ad4017acd7..bcd2a2070f6 100644
--- a/plc4go/protocols/opcua/readwrite/model/Annotation.go
+++ b/plc4go/protocols/opcua/readwrite/model/Annotation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AnnotationDataType.go b/plc4go/protocols/opcua/readwrite/model/AnnotationDataType.go
index 440d3de0c9e..639e5140dd5 100644
--- a/plc4go/protocols/opcua/readwrite/model/AnnotationDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AnnotationDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AnonymousIdentityToken.go b/plc4go/protocols/opcua/readwrite/model/AnonymousIdentityToken.go
index 1941fadbfe2..d96b26168de 100644
--- a/plc4go/protocols/opcua/readwrite/model/AnonymousIdentityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/AnonymousIdentityToken.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ApplicationDescription.go b/plc4go/protocols/opcua/readwrite/model/ApplicationDescription.go
index fe9ba1013e3..6f32da153d2 100644
--- a/plc4go/protocols/opcua/readwrite/model/ApplicationDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/ApplicationDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go b/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
index cbd0daa5906..d5b2d3fd62f 100644
--- a/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
+++ b/plc4go/protocols/opcua/readwrite/model/ApplicationInstanceCertificate.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ApplicationType.go b/plc4go/protocols/opcua/readwrite/model/ApplicationType.go
index ceff0c87198..e3b99a651bc 100644
--- a/plc4go/protocols/opcua/readwrite/model/ApplicationType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ApplicationType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Argument.go b/plc4go/protocols/opcua/readwrite/model/Argument.go
index 2fe922530c9..98feaa5385e 100644
--- a/plc4go/protocols/opcua/readwrite/model/Argument.go
+++ b/plc4go/protocols/opcua/readwrite/model/Argument.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AttributeWriteMask.go b/plc4go/protocols/opcua/readwrite/model/AttributeWriteMask.go
index b68c36cdfd0..164a43438b8 100644
--- a/plc4go/protocols/opcua/readwrite/model/AttributeWriteMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/AttributeWriteMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AudioDataType.go b/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
index 9a5b3f9836a..c1749bbc928 100644
--- a/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/AudioDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/AxisInformation.go b/plc4go/protocols/opcua/readwrite/model/AxisInformation.go
index 68879727fed..40e83ebdd1f 100644
--- a/plc4go/protocols/opcua/readwrite/model/AxisInformation.go
+++ b/plc4go/protocols/opcua/readwrite/model/AxisInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -106,12 +108,8 @@ type AxisInformationBuilder interface {
 	WithMandatoryFields(engineeringUnits ExtensionObjectDefinition, eURange ExtensionObjectDefinition, title LocalizedText, axisScaleType AxisScaleEnumeration, noOfAxisSteps int32, axisSteps []float64) AxisInformationBuilder
 	// WithEngineeringUnits adds EngineeringUnits (property field)
 	WithEngineeringUnits(ExtensionObjectDefinition) AxisInformationBuilder
-	// WithEngineeringUnitsBuilder adds EngineeringUnits (property field) which is build by the builder
-	WithEngineeringUnitsBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AxisInformationBuilder
 	// WithEURange adds EURange (property field)
 	WithEURange(ExtensionObjectDefinition) AxisInformationBuilder
-	// WithEURangeBuilder adds EURange (property field) which is build by the builder
-	WithEURangeBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AxisInformationBuilder
 	// WithTitle adds Title (property field)
 	WithTitle(LocalizedText) AxisInformationBuilder
 	// WithTitleBuilder adds Title (property field) which is build by the builder
@@ -150,37 +148,11 @@ func (m *_AxisInformationBuilder) WithEngineeringUnits(engineeringUnits Extensio
 	return m
 }
 
-func (m *_AxisInformationBuilder) WithEngineeringUnitsBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AxisInformationBuilder {
-	builder := builderSupplier(m.EngineeringUnits.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.EngineeringUnits, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AxisInformationBuilder) WithEURange(eURange ExtensionObjectDefinition) AxisInformationBuilder {
 	m.EURange = eURange
 	return m
 }
 
-func (m *_AxisInformationBuilder) WithEURangeBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) AxisInformationBuilder {
-	builder := builderSupplier(m.EURange.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.EURange, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_AxisInformationBuilder) WithTitle(title LocalizedText) AxisInformationBuilder {
 	m.Title = title
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/AxisScaleEnumeration.go b/plc4go/protocols/opcua/readwrite/model/AxisScaleEnumeration.go
index 27c154de6c3..04edccc2ca8 100644
--- a/plc4go/protocols/opcua/readwrite/model/AxisScaleEnumeration.go
+++ b/plc4go/protocols/opcua/readwrite/model/AxisScaleEnumeration.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go b/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
index 232f9f742ea..d1c8cd9f010 100644
--- a/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
+++ b/plc4go/protocols/opcua/readwrite/model/BinaryPayload.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BitFieldDefinition.go b/plc4go/protocols/opcua/readwrite/model/BitFieldDefinition.go
index 572bfb0a123..d2398127c23 100644
--- a/plc4go/protocols/opcua/readwrite/model/BitFieldDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/BitFieldDefinition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go b/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
index cf145d20a18..3ed6029fd48 100644
--- a/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/BitFieldMaskDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrokerTransportQualityOfService.go b/plc4go/protocols/opcua/readwrite/model/BrokerTransportQualityOfService.go
index 0453b2863ae..42fcabe315f 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrokerTransportQualityOfService.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrokerTransportQualityOfService.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseDescription.go b/plc4go/protocols/opcua/readwrite/model/BrowseDescription.go
index d948e77b589..be8f09f5839 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseDirection.go b/plc4go/protocols/opcua/readwrite/model/BrowseDirection.go
index 8dcf520453f..d7afc93340e 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseDirection.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseDirection.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseNextRequest.go b/plc4go/protocols/opcua/readwrite/model/BrowseNextRequest.go
index 5a6661f4ea6..e99b93e9ee4 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseNextRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseNextRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type BrowseNextRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, releaseContinuationPoints bool, noOfContinuationPoints int32, continuationPoints []PascalByteString) BrowseNextRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) BrowseNextRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseNextRequestBuilder
 	// WithReleaseContinuationPoints adds ReleaseContinuationPoints (property field)
 	WithReleaseContinuationPoints(bool) BrowseNextRequestBuilder
 	// WithNoOfContinuationPoints adds NoOfContinuationPoints (property field)
@@ -130,19 +130,6 @@ func (m *_BrowseNextRequestBuilder) WithRequestHeader(requestHeader ExtensionObj
 	return m
 }
 
-func (m *_BrowseNextRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseNextRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowseNextRequestBuilder) WithReleaseContinuationPoints(releaseContinuationPoints bool) BrowseNextRequestBuilder {
 	m.ReleaseContinuationPoints = releaseContinuationPoints
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseNextResponse.go b/plc4go/protocols/opcua/readwrite/model/BrowseNextResponse.go
index bf8eb055653..2fdcd6cec5b 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseNextResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseNextResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type BrowseNextResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) BrowseNextResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) BrowseNextResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseNextResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) BrowseNextResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_BrowseNextResponseBuilder) WithResponseHeader(responseHeader Extension
 	return m
 }
 
-func (m *_BrowseNextResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseNextResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowseNextResponseBuilder) WithNoOfResults(noOfResults int32) BrowseNextResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowsePath.go b/plc4go/protocols/opcua/readwrite/model/BrowsePath.go
index 5576774faa6..a54a927899a 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowsePath.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowsePath.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type BrowsePathBuilder interface {
 	WithStartingNodeBuilder(func(NodeIdBuilder) NodeIdBuilder) BrowsePathBuilder
 	// WithRelativePath adds RelativePath (property field)
 	WithRelativePath(ExtensionObjectDefinition) BrowsePathBuilder
-	// WithRelativePathBuilder adds RelativePath (property field) which is build by the builder
-	WithRelativePathBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowsePathBuilder
 	// Build builds the BrowsePath or returns an error if something is wrong
 	Build() (BrowsePath, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_BrowsePathBuilder) WithRelativePath(relativePath ExtensionObjectDefini
 	return m
 }
 
-func (m *_BrowsePathBuilder) WithRelativePathBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowsePathBuilder {
-	builder := builderSupplier(m.RelativePath.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RelativePath, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowsePathBuilder) Build() (BrowsePath, error) {
 	if m.StartingNode == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowsePathResult.go b/plc4go/protocols/opcua/readwrite/model/BrowsePathResult.go
index c907ba9ce55..1b5a456f117 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowsePathResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowsePathResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowsePathTarget.go b/plc4go/protocols/opcua/readwrite/model/BrowsePathTarget.go
index aba38e03da5..83d0c3193fd 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowsePathTarget.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowsePathTarget.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseRequest.go b/plc4go/protocols/opcua/readwrite/model/BrowseRequest.go
index 44cc0640f2b..9ea7fcb2217 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -99,12 +101,8 @@ type BrowseRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, view ExtensionObjectDefinition, requestedMaxReferencesPerNode uint32, noOfNodesToBrowse int32, nodesToBrowse []ExtensionObjectDefinition) BrowseRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) BrowseRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseRequestBuilder
 	// WithView adds View (property field)
 	WithView(ExtensionObjectDefinition) BrowseRequestBuilder
-	// WithViewBuilder adds View (property field) which is build by the builder
-	WithViewBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseRequestBuilder
 	// WithRequestedMaxReferencesPerNode adds RequestedMaxReferencesPerNode (property field)
 	WithRequestedMaxReferencesPerNode(uint32) BrowseRequestBuilder
 	// WithNoOfNodesToBrowse adds NoOfNodesToBrowse (property field)
@@ -139,37 +137,11 @@ func (m *_BrowseRequestBuilder) WithRequestHeader(requestHeader ExtensionObjectD
 	return m
 }
 
-func (m *_BrowseRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowseRequestBuilder) WithView(view ExtensionObjectDefinition) BrowseRequestBuilder {
 	m.View = view
 	return m
 }
 
-func (m *_BrowseRequestBuilder) WithViewBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseRequestBuilder {
-	builder := builderSupplier(m.View.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.View, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowseRequestBuilder) WithRequestedMaxReferencesPerNode(requestedMaxReferencesPerNode uint32) BrowseRequestBuilder {
 	m.RequestedMaxReferencesPerNode = requestedMaxReferencesPerNode
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseResponse.go b/plc4go/protocols/opcua/readwrite/model/BrowseResponse.go
index 8f66ccb75e0..b78f7bca142 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type BrowseResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) BrowseResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) BrowseResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) BrowseResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_BrowseResponseBuilder) WithResponseHeader(responseHeader ExtensionObje
 	return m
 }
 
-func (m *_BrowseResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) BrowseResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_BrowseResponseBuilder) WithNoOfResults(noOfResults int32) BrowseResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseResult.go b/plc4go/protocols/opcua/readwrite/model/BrowseResult.go
index 0d4fe7a50a3..f3c61d727b2 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BrowseResultMask.go b/plc4go/protocols/opcua/readwrite/model/BrowseResultMask.go
index 4d55369876e..e87721930ea 100644
--- a/plc4go/protocols/opcua/readwrite/model/BrowseResultMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/BrowseResultMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/BuildInfo.go b/plc4go/protocols/opcua/readwrite/model/BuildInfo.go
index ae57f4df387..705e5bffaa5 100644
--- a/plc4go/protocols/opcua/readwrite/model/BuildInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/BuildInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go b/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
index b61d7fdb63a..1dc05f02adc 100644
--- a/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
+++ b/plc4go/protocols/opcua/readwrite/model/ByteStringArray.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go b/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
index aa6ee6e8065..21587db9219 100644
--- a/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/ByteStringNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/CallMethodRequest.go b/plc4go/protocols/opcua/readwrite/model/CallMethodRequest.go
index 9f0255fc27e..2adf5f11d6a 100644
--- a/plc4go/protocols/opcua/readwrite/model/CallMethodRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CallMethodRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/CallMethodResult.go b/plc4go/protocols/opcua/readwrite/model/CallMethodResult.go
index 5d41456d16b..d5e3b265b4d 100644
--- a/plc4go/protocols/opcua/readwrite/model/CallMethodResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/CallMethodResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/CallRequest.go b/plc4go/protocols/opcua/readwrite/model/CallRequest.go
index 55575dcdf46..fff208556bc 100644
--- a/plc4go/protocols/opcua/readwrite/model/CallRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CallRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type CallRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfMethodsToCall int32, methodsToCall []ExtensionObjectDefinition) CallRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CallRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CallRequestBuilder
 	// WithNoOfMethodsToCall adds NoOfMethodsToCall (property field)
 	WithNoOfMethodsToCall(int32) CallRequestBuilder
 	// WithMethodsToCall adds MethodsToCall (property field)
@@ -122,19 +122,6 @@ func (m *_CallRequestBuilder) WithRequestHeader(requestHeader ExtensionObjectDef
 	return m
 }
 
-func (m *_CallRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CallRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CallRequestBuilder) WithNoOfMethodsToCall(noOfMethodsToCall int32) CallRequestBuilder {
 	m.NoOfMethodsToCall = noOfMethodsToCall
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CallResponse.go b/plc4go/protocols/opcua/readwrite/model/CallResponse.go
index 0c637666655..1f7536a2890 100644
--- a/plc4go/protocols/opcua/readwrite/model/CallResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CallResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type CallResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) CallResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CallResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CallResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) CallResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_CallResponseBuilder) WithResponseHeader(responseHeader ExtensionObject
 	return m
 }
 
-func (m *_CallResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CallResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CallResponseBuilder) WithNoOfResults(noOfResults int32) CallResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CancelRequest.go b/plc4go/protocols/opcua/readwrite/model/CancelRequest.go
index 924fa90359e..56053230492 100644
--- a/plc4go/protocols/opcua/readwrite/model/CancelRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CancelRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -84,8 +86,6 @@ type CancelRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, requestHandle uint32) CancelRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CancelRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CancelRequestBuilder
 	// WithRequestHandle adds RequestHandle (property field)
 	WithRequestHandle(uint32) CancelRequestBuilder
 	// Build builds the CancelRequest or returns an error if something is wrong
@@ -116,19 +116,6 @@ func (m *_CancelRequestBuilder) WithRequestHeader(requestHeader ExtensionObjectD
 	return m
 }
 
-func (m *_CancelRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CancelRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CancelRequestBuilder) WithRequestHandle(requestHandle uint32) CancelRequestBuilder {
 	m.RequestHandle = requestHandle
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CancelResponse.go b/plc4go/protocols/opcua/readwrite/model/CancelResponse.go
index bd0d41ed075..2f80fbfbca8 100644
--- a/plc4go/protocols/opcua/readwrite/model/CancelResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CancelResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -84,8 +86,6 @@ type CancelResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, cancelCount uint32) CancelResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CancelResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CancelResponseBuilder
 	// WithCancelCount adds CancelCount (property field)
 	WithCancelCount(uint32) CancelResponseBuilder
 	// Build builds the CancelResponse or returns an error if something is wrong
@@ -116,19 +116,6 @@ func (m *_CancelResponseBuilder) WithResponseHeader(responseHeader ExtensionObje
 	return m
 }
 
-func (m *_CancelResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CancelResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CancelResponseBuilder) WithCancelCount(cancelCount uint32) CancelResponseBuilder {
 	m.CancelCount = cancelCount
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CartesianCoordinates.go b/plc4go/protocols/opcua/readwrite/model/CartesianCoordinates.go
index e138ee45385..1fa85f7077f 100644
--- a/plc4go/protocols/opcua/readwrite/model/CartesianCoordinates.go
+++ b/plc4go/protocols/opcua/readwrite/model/CartesianCoordinates.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ChannelSecurityToken.go b/plc4go/protocols/opcua/readwrite/model/ChannelSecurityToken.go
index 49be85410f7..52fd01dc21d 100644
--- a/plc4go/protocols/opcua/readwrite/model/ChannelSecurityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/ChannelSecurityToken.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ChunkType.go b/plc4go/protocols/opcua/readwrite/model/ChunkType.go
index 3daa9d5e7ca..eeb30048231 100644
--- a/plc4go/protocols/opcua/readwrite/model/ChunkType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ChunkType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelRequest.go b/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelRequest.go
index 0158cd5f39e..5c2aea0fb83 100644
--- a/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CloseSecureChannelRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition) CloseSecureChannelRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CloseSecureChannelRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSecureChannelRequestBuilder
 	// Build builds the CloseSecureChannelRequest or returns an error if something is wrong
 	Build() (CloseSecureChannelRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CloseSecureChannelRequestBuilder) WithRequestHeader(requestHeader Exte
 	return m
 }
 
-func (m *_CloseSecureChannelRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSecureChannelRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CloseSecureChannelRequestBuilder) Build() (CloseSecureChannelRequest, error) {
 	if m.RequestHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelResponse.go b/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelResponse.go
index 12334cc2e26..31fdb6c5c59 100644
--- a/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CloseSecureChannelResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CloseSecureChannelResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition) CloseSecureChannelResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CloseSecureChannelResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSecureChannelResponseBuilder
 	// Build builds the CloseSecureChannelResponse or returns an error if something is wrong
 	Build() (CloseSecureChannelResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CloseSecureChannelResponseBuilder) WithResponseHeader(responseHeader E
 	return m
 }
 
-func (m *_CloseSecureChannelResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSecureChannelResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CloseSecureChannelResponseBuilder) Build() (CloseSecureChannelResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/CloseSessionRequest.go b/plc4go/protocols/opcua/readwrite/model/CloseSessionRequest.go
index e703a9ed15c..ba51012d70f 100644
--- a/plc4go/protocols/opcua/readwrite/model/CloseSessionRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CloseSessionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type CloseSessionRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, deleteSubscriptions bool) CloseSessionRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CloseSessionRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSessionRequestBuilder
 	// WithDeleteSubscriptions adds DeleteSubscriptions (property field)
 	WithDeleteSubscriptions(bool) CloseSessionRequestBuilder
 	// Build builds the CloseSessionRequest or returns an error if something is wrong
@@ -118,19 +118,6 @@ func (m *_CloseSessionRequestBuilder) WithRequestHeader(requestHeader ExtensionO
 	return m
 }
 
-func (m *_CloseSessionRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSessionRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CloseSessionRequestBuilder) WithDeleteSubscriptions(deleteSubscriptions bool) CloseSessionRequestBuilder {
 	m.DeleteSubscriptions = deleteSubscriptions
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CloseSessionResponse.go b/plc4go/protocols/opcua/readwrite/model/CloseSessionResponse.go
index e3e39211428..4c6b40241c6 100644
--- a/plc4go/protocols/opcua/readwrite/model/CloseSessionResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CloseSessionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type CloseSessionResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition) CloseSessionResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CloseSessionResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSessionResponseBuilder
 	// Build builds the CloseSessionResponse or returns an error if something is wrong
 	Build() (CloseSessionResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_CloseSessionResponseBuilder) WithResponseHeader(responseHeader Extensi
 	return m
 }
 
-func (m *_CloseSessionResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CloseSessionResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CloseSessionResponseBuilder) Build() (CloseSessionResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/ComplexNumberType.go b/plc4go/protocols/opcua/readwrite/model/ComplexNumberType.go
index 44f805937f7..9ca5783e153 100644
--- a/plc4go/protocols/opcua/readwrite/model/ComplexNumberType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ComplexNumberType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ConfigurationVersionDataType.go b/plc4go/protocols/opcua/readwrite/model/ConfigurationVersionDataType.go
index 59336b72289..086dcaf5864 100644
--- a/plc4go/protocols/opcua/readwrite/model/ConfigurationVersionDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ConfigurationVersionDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ConnectionTransportDataType.go b/plc4go/protocols/opcua/readwrite/model/ConnectionTransportDataType.go
index e50735f042c..ace0c60b024 100644
--- a/plc4go/protocols/opcua/readwrite/model/ConnectionTransportDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ConnectionTransportDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ContentFilter.go b/plc4go/protocols/opcua/readwrite/model/ContentFilter.go
index 78632e06b37..7be471a6d98 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContentFilter.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContentFilter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ContentFilterElement.go b/plc4go/protocols/opcua/readwrite/model/ContentFilterElement.go
index e8c9a216c0e..62492943846 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContentFilterElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContentFilterElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ContentFilterElementResult.go b/plc4go/protocols/opcua/readwrite/model/ContentFilterElementResult.go
index 949205bbfec..6cf5f1b4251 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContentFilterElementResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContentFilterElementResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ContentFilterResult.go b/plc4go/protocols/opcua/readwrite/model/ContentFilterResult.go
index 9390b5c1577..e726f601e8c 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContentFilterResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContentFilterResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go b/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
index c7840e66aac..a91929bf54b 100644
--- a/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
+++ b/plc4go/protocols/opcua/readwrite/model/ContinuationPoint.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ConversionLimitEnum.go b/plc4go/protocols/opcua/readwrite/model/ConversionLimitEnum.go
index ffd0cf2239b..d1007c9d422 100644
--- a/plc4go/protocols/opcua/readwrite/model/ConversionLimitEnum.go
+++ b/plc4go/protocols/opcua/readwrite/model/ConversionLimitEnum.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Counter.go b/plc4go/protocols/opcua/readwrite/model/Counter.go
index fb0238c50ff..7c3d45cbff6 100644
--- a/plc4go/protocols/opcua/readwrite/model/Counter.go
+++ b/plc4go/protocols/opcua/readwrite/model/Counter.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsRequest.go b/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsRequest.go
index 768bfe733ab..78563f37b6e 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type CreateMonitoredItemsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, timestampsToReturn TimestampsToReturn, noOfItemsToCreate int32, itemsToCreate []ExtensionObjectDefinition) CreateMonitoredItemsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CreateMonitoredItemsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateMonitoredItemsRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) CreateMonitoredItemsRequestBuilder
 	// WithTimestampsToReturn adds TimestampsToReturn (property field)
@@ -134,19 +134,6 @@ func (m *_CreateMonitoredItemsRequestBuilder) WithRequestHeader(requestHeader Ex
 	return m
 }
 
-func (m *_CreateMonitoredItemsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateMonitoredItemsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateMonitoredItemsRequestBuilder) WithSubscriptionId(subscriptionId uint32) CreateMonitoredItemsRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsResponse.go b/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsResponse.go
index bb4ef5279a1..b2966342862 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateMonitoredItemsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type CreateMonitoredItemsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) CreateMonitoredItemsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CreateMonitoredItemsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateMonitoredItemsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) CreateMonitoredItemsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_CreateMonitoredItemsResponseBuilder) WithResponseHeader(responseHeader
 	return m
 }
 
-func (m *_CreateMonitoredItemsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateMonitoredItemsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateMonitoredItemsResponseBuilder) WithNoOfResults(noOfResults int32) CreateMonitoredItemsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateSessionRequest.go b/plc4go/protocols/opcua/readwrite/model/CreateSessionRequest.go
index 9f9aa75fead..b783b765628 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateSessionRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateSessionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -130,12 +132,8 @@ type CreateSessionRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, clientDescription ExtensionObjectDefinition, serverUri PascalString, endpointUrl PascalString, sessionName PascalString, clientNonce PascalByteString, clientCertificate PascalByteString, requestedSessionTimeout float64, maxResponseMessageSize uint32) CreateSessionRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CreateSessionRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionRequestBuilder
 	// WithClientDescription adds ClientDescription (property field)
 	WithClientDescription(ExtensionObjectDefinition) CreateSessionRequestBuilder
-	// WithClientDescriptionBuilder adds ClientDescription (property field) which is build by the builder
-	WithClientDescriptionBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionRequestBuilder
 	// WithServerUri adds ServerUri (property field)
 	WithServerUri(PascalString) CreateSessionRequestBuilder
 	// WithServerUriBuilder adds ServerUri (property field) which is build by the builder
@@ -188,37 +186,11 @@ func (m *_CreateSessionRequestBuilder) WithRequestHeader(requestHeader Extension
 	return m
 }
 
-func (m *_CreateSessionRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSessionRequestBuilder) WithClientDescription(clientDescription ExtensionObjectDefinition) CreateSessionRequestBuilder {
 	m.ClientDescription = clientDescription
 	return m
 }
 
-func (m *_CreateSessionRequestBuilder) WithClientDescriptionBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionRequestBuilder {
-	builder := builderSupplier(m.ClientDescription.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ClientDescription, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSessionRequestBuilder) WithServerUri(serverUri PascalString) CreateSessionRequestBuilder {
 	m.ServerUri = serverUri
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateSessionResponse.go b/plc4go/protocols/opcua/readwrite/model/CreateSessionResponse.go
index ac12c494fa8..30c1862f753 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateSessionResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateSessionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -139,8 +141,6 @@ type CreateSessionResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, sessionId NodeId, authenticationToken NodeId, revisedSessionTimeout float64, serverNonce PascalByteString, serverCertificate PascalByteString, noOfServerEndpoints int32, serverEndpoints []ExtensionObjectDefinition, noOfServerSoftwareCertificates int32, serverSoftwareCertificates []ExtensionObjectDefinition, serverSignature ExtensionObjectDefinition, maxRequestMessageSize uint32) CreateSessionResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CreateSessionResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionResponseBuilder
 	// WithSessionId adds SessionId (property field)
 	WithSessionId(NodeId) CreateSessionResponseBuilder
 	// WithSessionIdBuilder adds SessionId (property field) which is build by the builder
@@ -169,8 +169,6 @@ type CreateSessionResponseBuilder interface {
 	WithServerSoftwareCertificates(...ExtensionObjectDefinition) CreateSessionResponseBuilder
 	// WithServerSignature adds ServerSignature (property field)
 	WithServerSignature(ExtensionObjectDefinition) CreateSessionResponseBuilder
-	// WithServerSignatureBuilder adds ServerSignature (property field) which is build by the builder
-	WithServerSignatureBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionResponseBuilder
 	// WithMaxRequestMessageSize adds MaxRequestMessageSize (property field)
 	WithMaxRequestMessageSize(uint32) CreateSessionResponseBuilder
 	// Build builds the CreateSessionResponse or returns an error if something is wrong
@@ -201,19 +199,6 @@ func (m *_CreateSessionResponseBuilder) WithResponseHeader(responseHeader Extens
 	return m
 }
 
-func (m *_CreateSessionResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSessionResponseBuilder) WithSessionId(sessionId NodeId) CreateSessionResponseBuilder {
 	m.SessionId = sessionId
 	return m
@@ -316,19 +301,6 @@ func (m *_CreateSessionResponseBuilder) WithServerSignature(serverSignature Exte
 	return m
 }
 
-func (m *_CreateSessionResponseBuilder) WithServerSignatureBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSessionResponseBuilder {
-	builder := builderSupplier(m.ServerSignature.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ServerSignature, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSessionResponseBuilder) WithMaxRequestMessageSize(maxRequestMessageSize uint32) CreateSessionResponseBuilder {
 	m.MaxRequestMessageSize = maxRequestMessageSize
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionRequest.go b/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionRequest.go
index 0fd8b734492..5cd526fb113 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -106,8 +108,6 @@ type CreateSubscriptionRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, requestedPublishingInterval float64, requestedLifetimeCount uint32, requestedMaxKeepAliveCount uint32, maxNotificationsPerPublish uint32, publishingEnabled bool, priority uint8) CreateSubscriptionRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) CreateSubscriptionRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSubscriptionRequestBuilder
 	// WithRequestedPublishingInterval adds RequestedPublishingInterval (property field)
 	WithRequestedPublishingInterval(float64) CreateSubscriptionRequestBuilder
 	// WithRequestedLifetimeCount adds RequestedLifetimeCount (property field)
@@ -148,19 +148,6 @@ func (m *_CreateSubscriptionRequestBuilder) WithRequestHeader(requestHeader Exte
 	return m
 }
 
-func (m *_CreateSubscriptionRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSubscriptionRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSubscriptionRequestBuilder) WithRequestedPublishingInterval(requestedPublishingInterval float64) CreateSubscriptionRequestBuilder {
 	m.RequestedPublishingInterval = requestedPublishingInterval
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionResponse.go b/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionResponse.go
index 2e5d9c178dd..17f16f128a1 100644
--- a/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/CreateSubscriptionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type CreateSubscriptionResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, subscriptionId uint32, revisedPublishingInterval float64, revisedLifetimeCount uint32, revisedMaxKeepAliveCount uint32) CreateSubscriptionResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) CreateSubscriptionResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSubscriptionResponseBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) CreateSubscriptionResponseBuilder
 	// WithRevisedPublishingInterval adds RevisedPublishingInterval (property field)
@@ -134,19 +134,6 @@ func (m *_CreateSubscriptionResponseBuilder) WithResponseHeader(responseHeader E
 	return m
 }
 
-func (m *_CreateSubscriptionResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) CreateSubscriptionResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_CreateSubscriptionResponseBuilder) WithSubscriptionId(subscriptionId uint32) CreateSubscriptionResponseBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/CurrencyUnitType.go b/plc4go/protocols/opcua/readwrite/model/CurrencyUnitType.go
index 84817b9ac66..5881435674e 100644
--- a/plc4go/protocols/opcua/readwrite/model/CurrencyUnitType.go
+++ b/plc4go/protocols/opcua/readwrite/model/CurrencyUnitType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataChangeNotification.go b/plc4go/protocols/opcua/readwrite/model/DataChangeNotification.go
index a08f32fa78d..cfb37eecfe0 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataChangeNotification.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataChangeNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataChangeTrigger.go b/plc4go/protocols/opcua/readwrite/model/DataChangeTrigger.go
index 557e8ed92f5..5d9ac191f67 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataChangeTrigger.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataChangeTrigger.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetFieldContentMask.go b/plc4go/protocols/opcua/readwrite/model/DataSetFieldContentMask.go
index 757c559f78d..ced72a5c790 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetFieldContentMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetFieldContentMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetFieldFlags.go b/plc4go/protocols/opcua/readwrite/model/DataSetFieldFlags.go
index 253f437eee9..4db01f2f64a 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetFieldFlags.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetFieldFlags.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetOrderingType.go b/plc4go/protocols/opcua/readwrite/model/DataSetOrderingType.go
index ac56deb81e6..8119fb9f738 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetOrderingType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetOrderingType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetReaderMessageDataType.go b/plc4go/protocols/opcua/readwrite/model/DataSetReaderMessageDataType.go
index 24d0750c4d7..b16d43ea54f 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetReaderMessageDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetReaderMessageDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetReaderTransportDataType.go b/plc4go/protocols/opcua/readwrite/model/DataSetReaderTransportDataType.go
index 47c2b53fc0a..4b29193d255 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetReaderTransportDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetReaderTransportDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetWriterDataType.go b/plc4go/protocols/opcua/readwrite/model/DataSetWriterDataType.go
index 9489142b9c5..e2ef963d933 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetWriterDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetWriterDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetWriterMessageDataType.go b/plc4go/protocols/opcua/readwrite/model/DataSetWriterMessageDataType.go
index 2cd0a10a0c6..1279c04397c 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetWriterMessageDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetWriterMessageDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataSetWriterTransportDataType.go b/plc4go/protocols/opcua/readwrite/model/DataSetWriterTransportDataType.go
index 8d087551df0..fb86c46030d 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataSetWriterTransportDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataSetWriterTransportDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataTypeDefinition.go b/plc4go/protocols/opcua/readwrite/model/DataTypeDefinition.go
index a501fe3698a..5ff31a51fbe 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataTypeDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataTypeDefinition.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataTypeDescription.go b/plc4go/protocols/opcua/readwrite/model/DataTypeDescription.go
index c430c85ac43..076e8c9a875 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataTypeDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataTypeDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataTypeSchemaHeader.go b/plc4go/protocols/opcua/readwrite/model/DataTypeSchemaHeader.go
index f07cf785a7c..b5740d0be84 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataTypeSchemaHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataTypeSchemaHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DataValue.go b/plc4go/protocols/opcua/readwrite/model/DataValue.go
index 7aa5e1824b4..a02f407c70e 100644
--- a/plc4go/protocols/opcua/readwrite/model/DataValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/DataValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -116,8 +118,6 @@ type DataValueBuilder interface {
 	WithValueSpecified(bool) DataValueBuilder
 	// WithValue adds Value (property field)
 	WithOptionalValue(Variant) DataValueBuilder
-	// WithOptionalValueBuilder adds Value (property field) which is build by the builder
-	WithOptionalValueBuilder(func(VariantBuilder) VariantBuilder) DataValueBuilder
 	// WithStatusCode adds StatusCode (property field)
 	WithOptionalStatusCode(StatusCode) DataValueBuilder
 	// WithOptionalStatusCodeBuilder adds StatusCode (property field) which is build by the builder
@@ -188,19 +188,6 @@ func (m *_DataValueBuilder) WithOptionalValue(value Variant) DataValueBuilder {
 	return m
 }
 
-func (m *_DataValueBuilder) WithOptionalValueBuilder(builderSupplier func(VariantBuilder) VariantBuilder) DataValueBuilder {
-	builder := builderSupplier(m.Value.CreateVariantBuilder())
-	var err error
-	m.Value, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DataValueBuilder) WithOptionalStatusCode(statusCode StatusCode) DataValueBuilder {
 	m.StatusCode = statusCode
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DateString.go b/plc4go/protocols/opcua/readwrite/model/DateString.go
index 10a98b9b1c4..67cd4bafb15 100644
--- a/plc4go/protocols/opcua/readwrite/model/DateString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DateString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DeadbandType.go b/plc4go/protocols/opcua/readwrite/model/DeadbandType.go
index 71ed91fee1d..94f83df32a9 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeadbandType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeadbandType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DecimalString.go b/plc4go/protocols/opcua/readwrite/model/DecimalString.go
index 70a30c7adb7..47b04f23181 100644
--- a/plc4go/protocols/opcua/readwrite/model/DecimalString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DecimalString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsRequest.go b/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsRequest.go
index 1e45be184f1..fbbd1ce7e56 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type DeleteMonitoredItemsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, noOfMonitoredItemIds int32, monitoredItemIds []uint32) DeleteMonitoredItemsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) DeleteMonitoredItemsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteMonitoredItemsRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) DeleteMonitoredItemsRequestBuilder
 	// WithNoOfMonitoredItemIds adds NoOfMonitoredItemIds (property field)
@@ -128,19 +128,6 @@ func (m *_DeleteMonitoredItemsRequestBuilder) WithRequestHeader(requestHeader Ex
 	return m
 }
 
-func (m *_DeleteMonitoredItemsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteMonitoredItemsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteMonitoredItemsRequestBuilder) WithSubscriptionId(subscriptionId uint32) DeleteMonitoredItemsRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsResponse.go b/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsResponse.go
index b2800d4f4da..26e69fe9c1e 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteMonitoredItemsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type DeleteMonitoredItemsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) DeleteMonitoredItemsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) DeleteMonitoredItemsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteMonitoredItemsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) DeleteMonitoredItemsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_DeleteMonitoredItemsResponseBuilder) WithResponseHeader(responseHeader
 	return m
 }
 
-func (m *_DeleteMonitoredItemsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteMonitoredItemsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteMonitoredItemsResponseBuilder) WithNoOfResults(noOfResults int32) DeleteMonitoredItemsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteNodesItem.go b/plc4go/protocols/opcua/readwrite/model/DeleteNodesItem.go
index 60c70deaa04..0d7e5121090 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteNodesItem.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteNodesItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteNodesRequest.go b/plc4go/protocols/opcua/readwrite/model/DeleteNodesRequest.go
index bfe9896da21..bbfe5d65704 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteNodesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteNodesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type DeleteNodesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfNodesToDelete int32, nodesToDelete []ExtensionObjectDefinition) DeleteNodesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) DeleteNodesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteNodesRequestBuilder
 	// WithNoOfNodesToDelete adds NoOfNodesToDelete (property field)
 	WithNoOfNodesToDelete(int32) DeleteNodesRequestBuilder
 	// WithNodesToDelete adds NodesToDelete (property field)
@@ -122,19 +122,6 @@ func (m *_DeleteNodesRequestBuilder) WithRequestHeader(requestHeader ExtensionOb
 	return m
 }
 
-func (m *_DeleteNodesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteNodesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteNodesRequestBuilder) WithNoOfNodesToDelete(noOfNodesToDelete int32) DeleteNodesRequestBuilder {
 	m.NoOfNodesToDelete = noOfNodesToDelete
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteNodesResponse.go b/plc4go/protocols/opcua/readwrite/model/DeleteNodesResponse.go
index 07eb5c66978..6770552e78a 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteNodesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteNodesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type DeleteNodesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) DeleteNodesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) DeleteNodesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteNodesResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) DeleteNodesResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_DeleteNodesResponseBuilder) WithResponseHeader(responseHeader Extensio
 	return m
 }
 
-func (m *_DeleteNodesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteNodesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteNodesResponseBuilder) WithNoOfResults(noOfResults int32) DeleteNodesResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesItem.go b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesItem.go
index 7b05b6e1884..229a1524208 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesItem.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesRequest.go b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesRequest.go
index fd9551a4bd9..a5b45d3fe0d 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type DeleteReferencesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfReferencesToDelete int32, referencesToDelete []ExtensionObjectDefinition) DeleteReferencesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) DeleteReferencesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteReferencesRequestBuilder
 	// WithNoOfReferencesToDelete adds NoOfReferencesToDelete (property field)
 	WithNoOfReferencesToDelete(int32) DeleteReferencesRequestBuilder
 	// WithReferencesToDelete adds ReferencesToDelete (property field)
@@ -122,19 +122,6 @@ func (m *_DeleteReferencesRequestBuilder) WithRequestHeader(requestHeader Extens
 	return m
 }
 
-func (m *_DeleteReferencesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteReferencesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteReferencesRequestBuilder) WithNoOfReferencesToDelete(noOfReferencesToDelete int32) DeleteReferencesRequestBuilder {
 	m.NoOfReferencesToDelete = noOfReferencesToDelete
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesResponse.go b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesResponse.go
index 7b3bf6ad852..11d959c6390 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteReferencesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteReferencesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type DeleteReferencesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) DeleteReferencesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) DeleteReferencesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteReferencesResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) DeleteReferencesResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_DeleteReferencesResponseBuilder) WithResponseHeader(responseHeader Ext
 	return m
 }
 
-func (m *_DeleteReferencesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteReferencesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteReferencesResponseBuilder) WithNoOfResults(noOfResults int32) DeleteReferencesResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsRequest.go b/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsRequest.go
index 48664eec4dd..e8d91244951 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type DeleteSubscriptionsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfSubscriptionIds int32, subscriptionIds []uint32) DeleteSubscriptionsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) DeleteSubscriptionsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteSubscriptionsRequestBuilder
 	// WithNoOfSubscriptionIds adds NoOfSubscriptionIds (property field)
 	WithNoOfSubscriptionIds(int32) DeleteSubscriptionsRequestBuilder
 	// WithSubscriptionIds adds SubscriptionIds (property field)
@@ -122,19 +122,6 @@ func (m *_DeleteSubscriptionsRequestBuilder) WithRequestHeader(requestHeader Ext
 	return m
 }
 
-func (m *_DeleteSubscriptionsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteSubscriptionsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteSubscriptionsRequestBuilder) WithNoOfSubscriptionIds(noOfSubscriptionIds int32) DeleteSubscriptionsRequestBuilder {
 	m.NoOfSubscriptionIds = noOfSubscriptionIds
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsResponse.go b/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsResponse.go
index 6f71ca9a1ec..c2c5dc11d57 100644
--- a/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/DeleteSubscriptionsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type DeleteSubscriptionsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) DeleteSubscriptionsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) DeleteSubscriptionsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteSubscriptionsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) DeleteSubscriptionsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_DeleteSubscriptionsResponseBuilder) WithResponseHeader(responseHeader
 	return m
 }
 
-func (m *_DeleteSubscriptionsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) DeleteSubscriptionsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_DeleteSubscriptionsResponseBuilder) WithNoOfResults(noOfResults int32) DeleteSubscriptionsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go b/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
index 359ae43a3af..e20f998bb5e 100644
--- a/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/DiagnosticInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DiagnosticsLevel.go b/plc4go/protocols/opcua/readwrite/model/DiagnosticsLevel.go
index 83eaaa9b14a..8d87ee46b85 100644
--- a/plc4go/protocols/opcua/readwrite/model/DiagnosticsLevel.go
+++ b/plc4go/protocols/opcua/readwrite/model/DiagnosticsLevel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DiscoveryConfiguration.go b/plc4go/protocols/opcua/readwrite/model/DiscoveryConfiguration.go
index 4184f5db0dc..0806b62f103 100644
--- a/plc4go/protocols/opcua/readwrite/model/DiscoveryConfiguration.go
+++ b/plc4go/protocols/opcua/readwrite/model/DiscoveryConfiguration.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DoubleComplexNumberType.go b/plc4go/protocols/opcua/readwrite/model/DoubleComplexNumberType.go
index 5768e2bf9af..6de23b1d423 100644
--- a/plc4go/protocols/opcua/readwrite/model/DoubleComplexNumberType.go
+++ b/plc4go/protocols/opcua/readwrite/model/DoubleComplexNumberType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Duplex.go b/plc4go/protocols/opcua/readwrite/model/Duplex.go
index bd5a544ee8c..d7c844d3b40 100644
--- a/plc4go/protocols/opcua/readwrite/model/Duplex.go
+++ b/plc4go/protocols/opcua/readwrite/model/Duplex.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/DurationString.go b/plc4go/protocols/opcua/readwrite/model/DurationString.go
index d4903d6c022..1652e904a4b 100644
--- a/plc4go/protocols/opcua/readwrite/model/DurationString.go
+++ b/plc4go/protocols/opcua/readwrite/model/DurationString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EUInformation.go b/plc4go/protocols/opcua/readwrite/model/EUInformation.go
index bb239e8c5ab..53e1cbdab33 100644
--- a/plc4go/protocols/opcua/readwrite/model/EUInformation.go
+++ b/plc4go/protocols/opcua/readwrite/model/EUInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go b/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
index 61bcbb7399d..ded10795d29 100644
--- a/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
+++ b/plc4go/protocols/opcua/readwrite/model/EccEncryptedSecret.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go b/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
index 174764467d5..6bee1ac8141 100644
--- a/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
+++ b/plc4go/protocols/opcua/readwrite/model/EncodedTicket.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EndpointConfiguration.go b/plc4go/protocols/opcua/readwrite/model/EndpointConfiguration.go
index e91f7ae2e0f..a69447f6141 100644
--- a/plc4go/protocols/opcua/readwrite/model/EndpointConfiguration.go
+++ b/plc4go/protocols/opcua/readwrite/model/EndpointConfiguration.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EndpointDescription.go b/plc4go/protocols/opcua/readwrite/model/EndpointDescription.go
index d34e5cd57ca..bafcad1a159 100644
--- a/plc4go/protocols/opcua/readwrite/model/EndpointDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/EndpointDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -128,8 +130,6 @@ type EndpointDescriptionBuilder interface {
 	WithEndpointUrlBuilder(func(PascalStringBuilder) PascalStringBuilder) EndpointDescriptionBuilder
 	// WithServer adds Server (property field)
 	WithServer(ExtensionObjectDefinition) EndpointDescriptionBuilder
-	// WithServerBuilder adds Server (property field) which is build by the builder
-	WithServerBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) EndpointDescriptionBuilder
 	// WithServerCertificate adds ServerCertificate (property field)
 	WithServerCertificate(PascalByteString) EndpointDescriptionBuilder
 	// WithServerCertificateBuilder adds ServerCertificate (property field) which is build by the builder
@@ -196,19 +196,6 @@ func (m *_EndpointDescriptionBuilder) WithServer(server ExtensionObjectDefinitio
 	return m
 }
 
-func (m *_EndpointDescriptionBuilder) WithServerBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) EndpointDescriptionBuilder {
-	builder := builderSupplier(m.Server.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.Server, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_EndpointDescriptionBuilder) WithServerCertificate(serverCertificate PascalByteString) EndpointDescriptionBuilder {
 	m.ServerCertificate = serverCertificate
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/EndpointType.go b/plc4go/protocols/opcua/readwrite/model/EndpointType.go
index 87da600407c..a5c5b5057d7 100644
--- a/plc4go/protocols/opcua/readwrite/model/EndpointType.go
+++ b/plc4go/protocols/opcua/readwrite/model/EndpointType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EndpointUrlListDataType.go b/plc4go/protocols/opcua/readwrite/model/EndpointUrlListDataType.go
index 5658d3bc728..a6d5eed39d2 100644
--- a/plc4go/protocols/opcua/readwrite/model/EndpointUrlListDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/EndpointUrlListDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EnumValueType.go b/plc4go/protocols/opcua/readwrite/model/EnumValueType.go
index 0656599d653..0f6a8c402b4 100644
--- a/plc4go/protocols/opcua/readwrite/model/EnumValueType.go
+++ b/plc4go/protocols/opcua/readwrite/model/EnumValueType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EphemeralKeyType.go b/plc4go/protocols/opcua/readwrite/model/EphemeralKeyType.go
index 8f13ac977d6..52133b0959e 100644
--- a/plc4go/protocols/opcua/readwrite/model/EphemeralKeyType.go
+++ b/plc4go/protocols/opcua/readwrite/model/EphemeralKeyType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EventFieldList.go b/plc4go/protocols/opcua/readwrite/model/EventFieldList.go
index b0c1939522e..4787fad2829 100644
--- a/plc4go/protocols/opcua/readwrite/model/EventFieldList.go
+++ b/plc4go/protocols/opcua/readwrite/model/EventFieldList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EventNotificationList.go b/plc4go/protocols/opcua/readwrite/model/EventNotificationList.go
index abd44f6762d..85b8eb3f294 100644
--- a/plc4go/protocols/opcua/readwrite/model/EventNotificationList.go
+++ b/plc4go/protocols/opcua/readwrite/model/EventNotificationList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/EventNotifierType.go b/plc4go/protocols/opcua/readwrite/model/EventNotifierType.go
index 79b1ead070e..f502a484424 100644
--- a/plc4go/protocols/opcua/readwrite/model/EventNotifierType.go
+++ b/plc4go/protocols/opcua/readwrite/model/EventNotifierType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ExceptionDeviationFormat.go b/plc4go/protocols/opcua/readwrite/model/ExceptionDeviationFormat.go
index 0994447e062..ed1c72702bc 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExceptionDeviationFormat.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExceptionDeviationFormat.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go b/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
index 0a698cab066..c4cdb62ebf6 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExpandedNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -90,8 +92,6 @@ type ExpandedNodeIdBuilder interface {
 	WithServerIndexSpecified(bool) ExpandedNodeIdBuilder
 	// WithNodeId adds NodeId (property field)
 	WithNodeId(NodeIdTypeDefinition) ExpandedNodeIdBuilder
-	// WithNodeIdBuilder adds NodeId (property field) which is build by the builder
-	WithNodeIdBuilder(func(NodeIdTypeDefinitionBuilder) NodeIdTypeDefinitionBuilder) ExpandedNodeIdBuilder
 	// WithNamespaceURI adds NamespaceURI (property field)
 	WithOptionalNamespaceURI(PascalString) ExpandedNodeIdBuilder
 	// WithOptionalNamespaceURIBuilder adds NamespaceURI (property field) which is build by the builder
@@ -136,19 +136,6 @@ func (m *_ExpandedNodeIdBuilder) WithNodeId(nodeId NodeIdTypeDefinition) Expande
 	return m
 }
 
-func (m *_ExpandedNodeIdBuilder) WithNodeIdBuilder(builderSupplier func(NodeIdTypeDefinitionBuilder) NodeIdTypeDefinitionBuilder) ExpandedNodeIdBuilder {
-	builder := builderSupplier(m.NodeId.CreateNodeIdTypeDefinitionBuilder())
-	var err error
-	m.NodeId, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "NodeIdTypeDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ExpandedNodeIdBuilder) WithOptionalNamespaceURI(namespaceURI PascalString) ExpandedNodeIdBuilder {
 	m.NamespaceURI = namespaceURI
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go b/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
index c09150beecf..3a816081ae0 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensiblePayload.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionHeader.go b/plc4go/protocols/opcua/readwrite/model/ExtensionHeader.go
index 830001b52f1..74c12deed6a 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
index 4093af7cbe0..fb8a19a57f3 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type ExtensionObjectBuilder interface {
 	WithOptionalEncodingMaskBuilder(func(ExtensionObjectEncodingMaskBuilder) ExtensionObjectEncodingMaskBuilder) ExtensionObjectBuilder
 	// WithBody adds Body (property field)
 	WithBody(ExtensionObjectDefinition) ExtensionObjectBuilder
-	// WithBodyBuilder adds Body (property field) which is build by the builder
-	WithBodyBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ExtensionObjectBuilder
 	// Build builds the ExtensionObject or returns an error if something is wrong
 	Build() (ExtensionObject, error)
 	// MustBuild does the same as Build but panics on error
@@ -160,19 +160,6 @@ func (m *_ExtensionObjectBuilder) WithBody(body ExtensionObjectDefinition) Exten
 	return m
 }
 
-func (m *_ExtensionObjectBuilder) WithBodyBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ExtensionObjectBuilder {
-	builder := builderSupplier(m.Body.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.Body, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ExtensionObjectBuilder) Build() (ExtensionObject, error) {
 	if m.TypeId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
index 3938d484961..93a512f9cab 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectDefinition.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
index 5e373081f8f..eaf1ee50795 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectEncodingMask.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/FieldMetaData.go b/plc4go/protocols/opcua/readwrite/model/FieldMetaData.go
index 8f4fe7ecc4a..c2d33fb10f5 100644
--- a/plc4go/protocols/opcua/readwrite/model/FieldMetaData.go
+++ b/plc4go/protocols/opcua/readwrite/model/FieldMetaData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/FieldTargetDataType.go b/plc4go/protocols/opcua/readwrite/model/FieldTargetDataType.go
index 38a21c3ac70..78ca247ba9c 100644
--- a/plc4go/protocols/opcua/readwrite/model/FieldTargetDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/FieldTargetDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -136,8 +138,6 @@ type FieldTargetDataTypeBuilder interface {
 	WithOverrideValueHandling(OverrideValueHandling) FieldTargetDataTypeBuilder
 	// WithOverrideValue adds OverrideValue (property field)
 	WithOverrideValue(Variant) FieldTargetDataTypeBuilder
-	// WithOverrideValueBuilder adds OverrideValue (property field) which is build by the builder
-	WithOverrideValueBuilder(func(VariantBuilder) VariantBuilder) FieldTargetDataTypeBuilder
 	// Build builds the FieldTargetDataType or returns an error if something is wrong
 	Build() (FieldTargetDataType, error)
 	// MustBuild does the same as Build but panics on error
@@ -248,19 +248,6 @@ func (m *_FieldTargetDataTypeBuilder) WithOverrideValue(overrideValue Variant) F
 	return m
 }
 
-func (m *_FieldTargetDataTypeBuilder) WithOverrideValueBuilder(builderSupplier func(VariantBuilder) VariantBuilder) FieldTargetDataTypeBuilder {
-	builder := builderSupplier(m.OverrideValue.CreateVariantBuilder())
-	var err error
-	m.OverrideValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FieldTargetDataTypeBuilder) Build() (FieldTargetDataType, error) {
 	if m.DataSetFieldId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/FilterOperand.go b/plc4go/protocols/opcua/readwrite/model/FilterOperand.go
index 13ae3322579..446f0bf9e35 100644
--- a/plc4go/protocols/opcua/readwrite/model/FilterOperand.go
+++ b/plc4go/protocols/opcua/readwrite/model/FilterOperand.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/FilterOperator.go b/plc4go/protocols/opcua/readwrite/model/FilterOperator.go
index 080684b0945..a77c51bb4be 100644
--- a/plc4go/protocols/opcua/readwrite/model/FilterOperator.go
+++ b/plc4go/protocols/opcua/readwrite/model/FilterOperator.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkRequest.go b/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkRequest.go
index f41681ffa04..97948245513 100644
--- a/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type FindServersOnNetworkRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, startingRecordId uint32, maxRecordsToReturn uint32, noOfServerCapabilityFilter int32, serverCapabilityFilter []PascalString) FindServersOnNetworkRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) FindServersOnNetworkRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersOnNetworkRequestBuilder
 	// WithStartingRecordId adds StartingRecordId (property field)
 	WithStartingRecordId(uint32) FindServersOnNetworkRequestBuilder
 	// WithMaxRecordsToReturn adds MaxRecordsToReturn (property field)
@@ -134,19 +134,6 @@ func (m *_FindServersOnNetworkRequestBuilder) WithRequestHeader(requestHeader Ex
 	return m
 }
 
-func (m *_FindServersOnNetworkRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersOnNetworkRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FindServersOnNetworkRequestBuilder) WithStartingRecordId(startingRecordId uint32) FindServersOnNetworkRequestBuilder {
 	m.StartingRecordId = startingRecordId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkResponse.go b/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkResponse.go
index b54c243756a..3c0e692c8d5 100644
--- a/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/FindServersOnNetworkResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type FindServersOnNetworkResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, lastCounterResetTime int64, noOfServers int32, servers []ExtensionObjectDefinition) FindServersOnNetworkResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) FindServersOnNetworkResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersOnNetworkResponseBuilder
 	// WithLastCounterResetTime adds LastCounterResetTime (property field)
 	WithLastCounterResetTime(int64) FindServersOnNetworkResponseBuilder
 	// WithNoOfServers adds NoOfServers (property field)
@@ -128,19 +128,6 @@ func (m *_FindServersOnNetworkResponseBuilder) WithResponseHeader(responseHeader
 	return m
 }
 
-func (m *_FindServersOnNetworkResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersOnNetworkResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FindServersOnNetworkResponseBuilder) WithLastCounterResetTime(lastCounterResetTime int64) FindServersOnNetworkResponseBuilder {
 	m.LastCounterResetTime = lastCounterResetTime
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/FindServersRequest.go b/plc4go/protocols/opcua/readwrite/model/FindServersRequest.go
index c3b1ccb30f8..7caa50bb3c3 100644
--- a/plc4go/protocols/opcua/readwrite/model/FindServersRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/FindServersRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -103,8 +105,6 @@ type FindServersRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, endpointUrl PascalString, noOfLocaleIds int32, localeIds []PascalString, noOfServerUris int32, serverUris []PascalString) FindServersRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) FindServersRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersRequestBuilder
 	// WithEndpointUrl adds EndpointUrl (property field)
 	WithEndpointUrl(PascalString) FindServersRequestBuilder
 	// WithEndpointUrlBuilder adds EndpointUrl (property field) which is build by the builder
@@ -145,19 +145,6 @@ func (m *_FindServersRequestBuilder) WithRequestHeader(requestHeader ExtensionOb
 	return m
 }
 
-func (m *_FindServersRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FindServersRequestBuilder) WithEndpointUrl(endpointUrl PascalString) FindServersRequestBuilder {
 	m.EndpointUrl = endpointUrl
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/FindServersResponse.go b/plc4go/protocols/opcua/readwrite/model/FindServersResponse.go
index 09a1381c2f7..910a0f89eec 100644
--- a/plc4go/protocols/opcua/readwrite/model/FindServersResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/FindServersResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type FindServersResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfServers int32, servers []ExtensionObjectDefinition) FindServersResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) FindServersResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersResponseBuilder
 	// WithNoOfServers adds NoOfServers (property field)
 	WithNoOfServers(int32) FindServersResponseBuilder
 	// WithServers adds Servers (property field)
@@ -122,19 +122,6 @@ func (m *_FindServersResponseBuilder) WithResponseHeader(responseHeader Extensio
 	return m
 }
 
-func (m *_FindServersResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) FindServersResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_FindServersResponseBuilder) WithNoOfServers(noOfServers int32) FindServersResponseBuilder {
 	m.NoOfServers = noOfServers
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go b/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
index 9de623b2ae3..c3bbb8a7e05 100644
--- a/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/FourByteNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Frame.go b/plc4go/protocols/opcua/readwrite/model/Frame.go
index af125e9178a..30f3668b045 100644
--- a/plc4go/protocols/opcua/readwrite/model/Frame.go
+++ b/plc4go/protocols/opcua/readwrite/model/Frame.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/GenericAttributeValue.go b/plc4go/protocols/opcua/readwrite/model/GenericAttributeValue.go
index dcffe09f3ba..c304e158deb 100644
--- a/plc4go/protocols/opcua/readwrite/model/GenericAttributeValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/GenericAttributeValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type GenericAttributeValueBuilder interface {
 	WithAttributeId(uint32) GenericAttributeValueBuilder
 	// WithValue adds Value (property field)
 	WithValue(Variant) GenericAttributeValueBuilder
-	// WithValueBuilder adds Value (property field) which is build by the builder
-	WithValueBuilder(func(VariantBuilder) VariantBuilder) GenericAttributeValueBuilder
 	// Build builds the GenericAttributeValue or returns an error if something is wrong
 	Build() (GenericAttributeValue, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_GenericAttributeValueBuilder) WithValue(value Variant) GenericAttribut
 	return m
 }
 
-func (m *_GenericAttributeValueBuilder) WithValueBuilder(builderSupplier func(VariantBuilder) VariantBuilder) GenericAttributeValueBuilder {
-	builder := builderSupplier(m.Value.CreateVariantBuilder())
-	var err error
-	m.Value, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_GenericAttributeValueBuilder) Build() (GenericAttributeValue, error) {
 	if m.Value == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/GetEndpointsRequest.go b/plc4go/protocols/opcua/readwrite/model/GetEndpointsRequest.go
index 791701ee025..8cb58d751b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/GetEndpointsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/GetEndpointsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -103,8 +105,6 @@ type GetEndpointsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, endpointUrl PascalString, noOfLocaleIds int32, localeIds []PascalString, noOfProfileUris int32, profileUris []PascalString) GetEndpointsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) GetEndpointsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) GetEndpointsRequestBuilder
 	// WithEndpointUrl adds EndpointUrl (property field)
 	WithEndpointUrl(PascalString) GetEndpointsRequestBuilder
 	// WithEndpointUrlBuilder adds EndpointUrl (property field) which is build by the builder
@@ -145,19 +145,6 @@ func (m *_GetEndpointsRequestBuilder) WithRequestHeader(requestHeader ExtensionO
 	return m
 }
 
-func (m *_GetEndpointsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) GetEndpointsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_GetEndpointsRequestBuilder) WithEndpointUrl(endpointUrl PascalString) GetEndpointsRequestBuilder {
 	m.EndpointUrl = endpointUrl
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/GetEndpointsResponse.go b/plc4go/protocols/opcua/readwrite/model/GetEndpointsResponse.go
index 93b89657b01..9491237b9aa 100644
--- a/plc4go/protocols/opcua/readwrite/model/GetEndpointsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/GetEndpointsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type GetEndpointsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfEndpoints int32, endpoints []ExtensionObjectDefinition) GetEndpointsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) GetEndpointsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) GetEndpointsResponseBuilder
 	// WithNoOfEndpoints adds NoOfEndpoints (property field)
 	WithNoOfEndpoints(int32) GetEndpointsResponseBuilder
 	// WithEndpoints adds Endpoints (property field)
@@ -122,19 +122,6 @@ func (m *_GetEndpointsResponseBuilder) WithResponseHeader(responseHeader Extensi
 	return m
 }
 
-func (m *_GetEndpointsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) GetEndpointsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_GetEndpointsResponseBuilder) WithNoOfEndpoints(noOfEndpoints int32) GetEndpointsResponseBuilder {
 	m.NoOfEndpoints = noOfEndpoints
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go b/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
index c680b2ae1b9..466aceaaeea 100644
--- a/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/GuidNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/GuidValue.go b/plc4go/protocols/opcua/readwrite/model/GuidValue.go
index 0f3d0f3be69..135f67c6f49 100644
--- a/plc4go/protocols/opcua/readwrite/model/GuidValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/GuidValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Handle.go b/plc4go/protocols/opcua/readwrite/model/Handle.go
index 17234d33e0c..0be58f6c8db 100644
--- a/plc4go/protocols/opcua/readwrite/model/Handle.go
+++ b/plc4go/protocols/opcua/readwrite/model/Handle.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryData.go b/plc4go/protocols/opcua/readwrite/model/HistoryData.go
index 4b843b11d6a..df164cd6940 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryData.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryEvent.go b/plc4go/protocols/opcua/readwrite/model/HistoryEvent.go
index e8a4c5f8040..22c9bda8ecf 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryEvent.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryEvent.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryEventFieldList.go b/plc4go/protocols/opcua/readwrite/model/HistoryEventFieldList.go
index 45dc03b5f5b..84072b1e146 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryEventFieldList.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryEventFieldList.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryReadDetails.go b/plc4go/protocols/opcua/readwrite/model/HistoryReadDetails.go
index 31c7c0bf490..abda361ca16 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryReadDetails.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryReadDetails.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryReadRequest.go b/plc4go/protocols/opcua/readwrite/model/HistoryReadRequest.go
index cb57950ba72..3d375a3a299 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryReadRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryReadRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -105,8 +107,6 @@ type HistoryReadRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, historyReadDetails ExtensionObject, timestampsToReturn TimestampsToReturn, releaseContinuationPoints bool, noOfNodesToRead int32, nodesToRead []ExtensionObjectDefinition) HistoryReadRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) HistoryReadRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryReadRequestBuilder
 	// WithHistoryReadDetails adds HistoryReadDetails (property field)
 	WithHistoryReadDetails(ExtensionObject) HistoryReadRequestBuilder
 	// WithHistoryReadDetailsBuilder adds HistoryReadDetails (property field) which is build by the builder
@@ -147,19 +147,6 @@ func (m *_HistoryReadRequestBuilder) WithRequestHeader(requestHeader ExtensionOb
 	return m
 }
 
-func (m *_HistoryReadRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryReadRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_HistoryReadRequestBuilder) WithHistoryReadDetails(historyReadDetails ExtensionObject) HistoryReadRequestBuilder {
 	m.HistoryReadDetails = historyReadDetails
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryReadResponse.go b/plc4go/protocols/opcua/readwrite/model/HistoryReadResponse.go
index 82a239c7438..15abf3a8c2d 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryReadResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryReadResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type HistoryReadResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) HistoryReadResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) HistoryReadResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryReadResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) HistoryReadResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_HistoryReadResponseBuilder) WithResponseHeader(responseHeader Extensio
 	return m
 }
 
-func (m *_HistoryReadResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryReadResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_HistoryReadResponseBuilder) WithNoOfResults(noOfResults int32) HistoryReadResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryReadResult.go b/plc4go/protocols/opcua/readwrite/model/HistoryReadResult.go
index 758dd5c8db5..4767b05be3d 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryReadResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryReadResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryReadValueId.go b/plc4go/protocols/opcua/readwrite/model/HistoryReadValueId.go
index 25f36fa13a8..14cd86d8c49 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryReadValueId.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryReadValueId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateDetails.go b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateDetails.go
index ae629c8243a..ec501532061 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateDetails.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateDetails.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateRequest.go b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateRequest.go
index 6c6ce417f8d..8ccaa9babaf 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type HistoryUpdateRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfHistoryUpdateDetails int32, historyUpdateDetails []ExtensionObject) HistoryUpdateRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) HistoryUpdateRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryUpdateRequestBuilder
 	// WithNoOfHistoryUpdateDetails adds NoOfHistoryUpdateDetails (property field)
 	WithNoOfHistoryUpdateDetails(int32) HistoryUpdateRequestBuilder
 	// WithHistoryUpdateDetails adds HistoryUpdateDetails (property field)
@@ -122,19 +122,6 @@ func (m *_HistoryUpdateRequestBuilder) WithRequestHeader(requestHeader Extension
 	return m
 }
 
-func (m *_HistoryUpdateRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryUpdateRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_HistoryUpdateRequestBuilder) WithNoOfHistoryUpdateDetails(noOfHistoryUpdateDetails int32) HistoryUpdateRequestBuilder {
 	m.NoOfHistoryUpdateDetails = noOfHistoryUpdateDetails
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResponse.go b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResponse.go
index 175972bfc3b..eedf35475c7 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type HistoryUpdateResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) HistoryUpdateResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) HistoryUpdateResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryUpdateResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) HistoryUpdateResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_HistoryUpdateResponseBuilder) WithResponseHeader(responseHeader Extens
 	return m
 }
 
-func (m *_HistoryUpdateResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) HistoryUpdateResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_HistoryUpdateResponseBuilder) WithNoOfResults(noOfResults int32) HistoryUpdateResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResult.go b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResult.go
index 70da861f39f..1453388c01f 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateType.go b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateType.go
index 1b1e86c8c51..a159b1de2de 100644
--- a/plc4go/protocols/opcua/readwrite/model/HistoryUpdateType.go
+++ b/plc4go/protocols/opcua/readwrite/model/HistoryUpdateType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/IdType.go b/plc4go/protocols/opcua/readwrite/model/IdType.go
index 4c541c7a3d4..d597b02ab54 100644
--- a/plc4go/protocols/opcua/readwrite/model/IdType.go
+++ b/plc4go/protocols/opcua/readwrite/model/IdType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/IdentityCriteriaType.go b/plc4go/protocols/opcua/readwrite/model/IdentityCriteriaType.go
index d84ef7b3102..554f519bdd8 100644
--- a/plc4go/protocols/opcua/readwrite/model/IdentityCriteriaType.go
+++ b/plc4go/protocols/opcua/readwrite/model/IdentityCriteriaType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/IdentityMappingRuleType.go b/plc4go/protocols/opcua/readwrite/model/IdentityMappingRuleType.go
index 6f050316c1e..cab60275017 100644
--- a/plc4go/protocols/opcua/readwrite/model/IdentityMappingRuleType.go
+++ b/plc4go/protocols/opcua/readwrite/model/IdentityMappingRuleType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageBMP.go b/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
index 000e00a7fc3..d047b89fe8d 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageBMP.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageGIF.go b/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
index 8297b135071..f989376986d 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageGIF.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ImageJPG.go b/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
index ea7169cc233..ba618af2f65 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImageJPG.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ImagePNG.go b/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
index 37393742188..d98fe4372e0 100644
--- a/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
+++ b/plc4go/protocols/opcua/readwrite/model/ImagePNG.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Index.go b/plc4go/protocols/opcua/readwrite/model/Index.go
index fbbb960a0ca..9847d36d8af 100644
--- a/plc4go/protocols/opcua/readwrite/model/Index.go
+++ b/plc4go/protocols/opcua/readwrite/model/Index.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/IntegerId.go b/plc4go/protocols/opcua/readwrite/model/IntegerId.go
index c9fa9b6777b..37421e03a1d 100644
--- a/plc4go/protocols/opcua/readwrite/model/IntegerId.go
+++ b/plc4go/protocols/opcua/readwrite/model/IntegerId.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/InterfaceAdminStatus.go b/plc4go/protocols/opcua/readwrite/model/InterfaceAdminStatus.go
index c8d962cd547..23e6bee625d 100644
--- a/plc4go/protocols/opcua/readwrite/model/InterfaceAdminStatus.go
+++ b/plc4go/protocols/opcua/readwrite/model/InterfaceAdminStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/InterfaceOperStatus.go b/plc4go/protocols/opcua/readwrite/model/InterfaceOperStatus.go
index 5f2f227c5e0..4e718886571 100644
--- a/plc4go/protocols/opcua/readwrite/model/InterfaceOperStatus.go
+++ b/plc4go/protocols/opcua/readwrite/model/InterfaceOperStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/IssuedIdentityToken.go b/plc4go/protocols/opcua/readwrite/model/IssuedIdentityToken.go
index 1d13dfb09d8..e707d5f8fbf 100644
--- a/plc4go/protocols/opcua/readwrite/model/IssuedIdentityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/IssuedIdentityToken.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/JsonDataSetMessageContentMask.go b/plc4go/protocols/opcua/readwrite/model/JsonDataSetMessageContentMask.go
index 471c1343a23..4d2338d5a14 100644
--- a/plc4go/protocols/opcua/readwrite/model/JsonDataSetMessageContentMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/JsonDataSetMessageContentMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/JsonNetworkMessageContentMask.go b/plc4go/protocols/opcua/readwrite/model/JsonNetworkMessageContentMask.go
index 5fa9b3f3dff..89273d4d813 100644
--- a/plc4go/protocols/opcua/readwrite/model/JsonNetworkMessageContentMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/JsonNetworkMessageContentMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/KeyValuePair.go b/plc4go/protocols/opcua/readwrite/model/KeyValuePair.go
index ddd05e9ec8d..109609680b5 100644
--- a/plc4go/protocols/opcua/readwrite/model/KeyValuePair.go
+++ b/plc4go/protocols/opcua/readwrite/model/KeyValuePair.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type KeyValuePairBuilder interface {
 	WithKeyBuilder(func(QualifiedNameBuilder) QualifiedNameBuilder) KeyValuePairBuilder
 	// WithValue adds Value (property field)
 	WithValue(Variant) KeyValuePairBuilder
-	// WithValueBuilder adds Value (property field) which is build by the builder
-	WithValueBuilder(func(VariantBuilder) VariantBuilder) KeyValuePairBuilder
 	// Build builds the KeyValuePair or returns an error if something is wrong
 	Build() (KeyValuePair, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_KeyValuePairBuilder) WithValue(value Variant) KeyValuePairBuilder {
 	return m
 }
 
-func (m *_KeyValuePairBuilder) WithValueBuilder(builderSupplier func(VariantBuilder) VariantBuilder) KeyValuePairBuilder {
-	builder := builderSupplier(m.Value.CreateVariantBuilder())
-	var err error
-	m.Value, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_KeyValuePairBuilder) Build() (KeyValuePair, error) {
 	if m.Key == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/LinearConversionDataType.go b/plc4go/protocols/opcua/readwrite/model/LinearConversionDataType.go
index 6ceeea9d8c0..ff61cc2e8d6 100644
--- a/plc4go/protocols/opcua/readwrite/model/LinearConversionDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/LinearConversionDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/LocaleId.go b/plc4go/protocols/opcua/readwrite/model/LocaleId.go
index ca51d2c31a3..23e662ee758 100644
--- a/plc4go/protocols/opcua/readwrite/model/LocaleId.go
+++ b/plc4go/protocols/opcua/readwrite/model/LocaleId.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/LocalizedText.go b/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
index 1d6fe0648cd..9630af4e351 100644
--- a/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
+++ b/plc4go/protocols/opcua/readwrite/model/LocalizedText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MessagePDU.go b/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
index 875197f1da4..23e8b027fd3 100644
--- a/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
+++ b/plc4go/protocols/opcua/readwrite/model/MessagePDU.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MessageSecurityMode.go b/plc4go/protocols/opcua/readwrite/model/MessageSecurityMode.go
index b4e3af8e13b..5af57bd3488 100644
--- a/plc4go/protocols/opcua/readwrite/model/MessageSecurityMode.go
+++ b/plc4go/protocols/opcua/readwrite/model/MessageSecurityMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MessageType.go b/plc4go/protocols/opcua/readwrite/model/MessageType.go
index 959fa22f361..9c367d918e6 100644
--- a/plc4go/protocols/opcua/readwrite/model/MessageType.go
+++ b/plc4go/protocols/opcua/readwrite/model/MessageType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureDataType.go b/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureDataType.go
index 97df158f55e..39fc15cfb8c 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureVerbMask.go b/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureVerbMask.go
index 7a877dbf580..62cf1b027ec 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureVerbMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModelChangeStructureVerbMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ModificationInfo.go b/plc4go/protocols/opcua/readwrite/model/ModificationInfo.go
index e9e501f71b5..195cf7556f9 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModificationInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModificationInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsRequest.go b/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsRequest.go
index 7d0cd0adfdd..e17ec1ca65f 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type ModifyMonitoredItemsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, timestampsToReturn TimestampsToReturn, noOfItemsToModify int32, itemsToModify []ExtensionObjectDefinition) ModifyMonitoredItemsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) ModifyMonitoredItemsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifyMonitoredItemsRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) ModifyMonitoredItemsRequestBuilder
 	// WithTimestampsToReturn adds TimestampsToReturn (property field)
@@ -134,19 +134,6 @@ func (m *_ModifyMonitoredItemsRequestBuilder) WithRequestHeader(requestHeader Ex
 	return m
 }
 
-func (m *_ModifyMonitoredItemsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifyMonitoredItemsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModifyMonitoredItemsRequestBuilder) WithSubscriptionId(subscriptionId uint32) ModifyMonitoredItemsRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsResponse.go b/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsResponse.go
index 760e920e1ed..8a0d7423fb4 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModifyMonitoredItemsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type ModifyMonitoredItemsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) ModifyMonitoredItemsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) ModifyMonitoredItemsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifyMonitoredItemsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) ModifyMonitoredItemsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_ModifyMonitoredItemsResponseBuilder) WithResponseHeader(responseHeader
 	return m
 }
 
-func (m *_ModifyMonitoredItemsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifyMonitoredItemsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModifyMonitoredItemsResponseBuilder) WithNoOfResults(noOfResults int32) ModifyMonitoredItemsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionRequest.go b/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionRequest.go
index 503cdfe8631..8366d5908cf 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -104,8 +106,6 @@ type ModifySubscriptionRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, requestedPublishingInterval float64, requestedLifetimeCount uint32, requestedMaxKeepAliveCount uint32, maxNotificationsPerPublish uint32, priority uint8) ModifySubscriptionRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) ModifySubscriptionRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifySubscriptionRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) ModifySubscriptionRequestBuilder
 	// WithRequestedPublishingInterval adds RequestedPublishingInterval (property field)
@@ -146,19 +146,6 @@ func (m *_ModifySubscriptionRequestBuilder) WithRequestHeader(requestHeader Exte
 	return m
 }
 
-func (m *_ModifySubscriptionRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifySubscriptionRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModifySubscriptionRequestBuilder) WithSubscriptionId(subscriptionId uint32) ModifySubscriptionRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionResponse.go b/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionResponse.go
index 6dea267e93d..14bb21218cc 100644
--- a/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/ModifySubscriptionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -92,8 +94,6 @@ type ModifySubscriptionResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, revisedPublishingInterval float64, revisedLifetimeCount uint32, revisedMaxKeepAliveCount uint32) ModifySubscriptionResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) ModifySubscriptionResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifySubscriptionResponseBuilder
 	// WithRevisedPublishingInterval adds RevisedPublishingInterval (property field)
 	WithRevisedPublishingInterval(float64) ModifySubscriptionResponseBuilder
 	// WithRevisedLifetimeCount adds RevisedLifetimeCount (property field)
@@ -128,19 +128,6 @@ func (m *_ModifySubscriptionResponseBuilder) WithResponseHeader(responseHeader E
 	return m
 }
 
-func (m *_ModifySubscriptionResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ModifySubscriptionResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ModifySubscriptionResponseBuilder) WithRevisedPublishingInterval(revisedPublishingInterval float64) ModifySubscriptionResponseBuilder {
 	m.RevisedPublishingInterval = revisedPublishingInterval
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateRequest.go b/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateRequest.go
index 1f832ab5c3d..27add2f7747 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,14 +93,10 @@ type MonitoredItemCreateRequestBuilder interface {
 	WithMandatoryFields(itemToMonitor ExtensionObjectDefinition, monitoringMode MonitoringMode, requestedParameters ExtensionObjectDefinition) MonitoredItemCreateRequestBuilder
 	// WithItemToMonitor adds ItemToMonitor (property field)
 	WithItemToMonitor(ExtensionObjectDefinition) MonitoredItemCreateRequestBuilder
-	// WithItemToMonitorBuilder adds ItemToMonitor (property field) which is build by the builder
-	WithItemToMonitorBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemCreateRequestBuilder
 	// WithMonitoringMode adds MonitoringMode (property field)
 	WithMonitoringMode(MonitoringMode) MonitoredItemCreateRequestBuilder
 	// WithRequestedParameters adds RequestedParameters (property field)
 	WithRequestedParameters(ExtensionObjectDefinition) MonitoredItemCreateRequestBuilder
-	// WithRequestedParametersBuilder adds RequestedParameters (property field) which is build by the builder
-	WithRequestedParametersBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemCreateRequestBuilder
 	// Build builds the MonitoredItemCreateRequest or returns an error if something is wrong
 	Build() (MonitoredItemCreateRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -127,19 +125,6 @@ func (m *_MonitoredItemCreateRequestBuilder) WithItemToMonitor(itemToMonitor Ext
 	return m
 }
 
-func (m *_MonitoredItemCreateRequestBuilder) WithItemToMonitorBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemCreateRequestBuilder {
-	builder := builderSupplier(m.ItemToMonitor.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ItemToMonitor, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredItemCreateRequestBuilder) WithMonitoringMode(monitoringMode MonitoringMode) MonitoredItemCreateRequestBuilder {
 	m.MonitoringMode = monitoringMode
 	return m
@@ -150,19 +135,6 @@ func (m *_MonitoredItemCreateRequestBuilder) WithRequestedParameters(requestedPa
 	return m
 }
 
-func (m *_MonitoredItemCreateRequestBuilder) WithRequestedParametersBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemCreateRequestBuilder {
-	builder := builderSupplier(m.RequestedParameters.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestedParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredItemCreateRequestBuilder) Build() (MonitoredItemCreateRequest, error) {
 	if m.ItemToMonitor == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateResult.go b/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateResult.go
index 97bb00a4dab..5eefb09ed69 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoredItemCreateResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyRequest.go b/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyRequest.go
index 360ab218845..8b4235cf188 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -86,8 +88,6 @@ type MonitoredItemModifyRequestBuilder interface {
 	WithMonitoredItemId(uint32) MonitoredItemModifyRequestBuilder
 	// WithRequestedParameters adds RequestedParameters (property field)
 	WithRequestedParameters(ExtensionObjectDefinition) MonitoredItemModifyRequestBuilder
-	// WithRequestedParametersBuilder adds RequestedParameters (property field) which is build by the builder
-	WithRequestedParametersBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemModifyRequestBuilder
 	// Build builds the MonitoredItemModifyRequest or returns an error if something is wrong
 	Build() (MonitoredItemModifyRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,19 +121,6 @@ func (m *_MonitoredItemModifyRequestBuilder) WithRequestedParameters(requestedPa
 	return m
 }
 
-func (m *_MonitoredItemModifyRequestBuilder) WithRequestedParametersBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) MonitoredItemModifyRequestBuilder {
-	builder := builderSupplier(m.RequestedParameters.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestedParameters, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_MonitoredItemModifyRequestBuilder) Build() (MonitoredItemModifyRequest, error) {
 	if m.RequestedParameters == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyResult.go b/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyResult.go
index 6861f914ba2..5e759abaa65 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoredItemModifyResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoredItemNotification.go b/plc4go/protocols/opcua/readwrite/model/MonitoredItemNotification.go
index 0010aabfce6..7c01fec033d 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoredItemNotification.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoredItemNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoringFilter.go b/plc4go/protocols/opcua/readwrite/model/MonitoringFilter.go
index bdc525d9f72..9b4ab023a6f 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoringFilter.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoringFilter.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoringFilterResult.go b/plc4go/protocols/opcua/readwrite/model/MonitoringFilterResult.go
index d6be3dd05b1..e73e7d55b04 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoringFilterResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoringFilterResult.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoringMode.go b/plc4go/protocols/opcua/readwrite/model/MonitoringMode.go
index 79eb7e4d57b..f665927962c 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoringMode.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoringMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/MonitoringParameters.go b/plc4go/protocols/opcua/readwrite/model/MonitoringParameters.go
index 6c0909eac65..dc9fe337c69 100644
--- a/plc4go/protocols/opcua/readwrite/model/MonitoringParameters.go
+++ b/plc4go/protocols/opcua/readwrite/model/MonitoringParameters.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NamingRuleType.go b/plc4go/protocols/opcua/readwrite/model/NamingRuleType.go
index 540b94faa25..a9896e77c14 100644
--- a/plc4go/protocols/opcua/readwrite/model/NamingRuleType.go
+++ b/plc4go/protocols/opcua/readwrite/model/NamingRuleType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NegotiationStatus.go b/plc4go/protocols/opcua/readwrite/model/NegotiationStatus.go
index d6f6ff7040f..c54f7a32ac5 100644
--- a/plc4go/protocols/opcua/readwrite/model/NegotiationStatus.go
+++ b/plc4go/protocols/opcua/readwrite/model/NegotiationStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NetworkAddressDataType.go b/plc4go/protocols/opcua/readwrite/model/NetworkAddressDataType.go
index 60995514c05..3bb6df86083 100644
--- a/plc4go/protocols/opcua/readwrite/model/NetworkAddressDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/NetworkAddressDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NetworkGroupDataType.go b/plc4go/protocols/opcua/readwrite/model/NetworkGroupDataType.go
index 611cf4baab2..1bda0b4e253 100644
--- a/plc4go/protocols/opcua/readwrite/model/NetworkGroupDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/NetworkGroupDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeAttributes.go b/plc4go/protocols/opcua/readwrite/model/NodeAttributes.go
index f147136b5fd..e13ed45aacd 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeAttributes.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeAttributes.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeAttributesMask.go b/plc4go/protocols/opcua/readwrite/model/NodeAttributesMask.go
index 41663c206ae..4f2bf3a99f6 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeAttributesMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeAttributesMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeClass.go b/plc4go/protocols/opcua/readwrite/model/NodeClass.go
index a5a78e217f8..af7c108707c 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeClass.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeId.go b/plc4go/protocols/opcua/readwrite/model/NodeId.go
index 8c0bfc31edc..52d39f500ab 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -76,8 +78,6 @@ type NodeIdBuilder interface {
 	WithMandatoryFields(nodeId NodeIdTypeDefinition) NodeIdBuilder
 	// WithNodeId adds NodeId (property field)
 	WithNodeId(NodeIdTypeDefinition) NodeIdBuilder
-	// WithNodeIdBuilder adds NodeId (property field) which is build by the builder
-	WithNodeIdBuilder(func(NodeIdTypeDefinitionBuilder) NodeIdTypeDefinitionBuilder) NodeIdBuilder
 	// Build builds the NodeId or returns an error if something is wrong
 	Build() (NodeId, error)
 	// MustBuild does the same as Build but panics on error
@@ -106,19 +106,6 @@ func (m *_NodeIdBuilder) WithNodeId(nodeId NodeIdTypeDefinition) NodeIdBuilder {
 	return m
 }
 
-func (m *_NodeIdBuilder) WithNodeIdBuilder(builderSupplier func(NodeIdTypeDefinitionBuilder) NodeIdTypeDefinitionBuilder) NodeIdBuilder {
-	builder := builderSupplier(m.NodeId.CreateNodeIdTypeDefinitionBuilder())
-	var err error
-	m.NodeId, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "NodeIdTypeDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_NodeIdBuilder) Build() (NodeId, error) {
 	if m.NodeId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdByteString.go b/plc4go/protocols/opcua/readwrite/model/NodeIdByteString.go
index a39a367da54..b34d4e987b8 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdByteString.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdByteString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdFourByte.go b/plc4go/protocols/opcua/readwrite/model/NodeIdFourByte.go
index ac80d537bce..28f5b1e47b7 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdFourByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdFourByte.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdGuid.go b/plc4go/protocols/opcua/readwrite/model/NodeIdGuid.go
index ae04ba6c72d..70f87dc9dee 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdGuid.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdGuid.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdNumeric.go b/plc4go/protocols/opcua/readwrite/model/NodeIdNumeric.go
index 08084ab8578..e23b5f6f7fe 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdNumeric.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdNumeric.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdString.go b/plc4go/protocols/opcua/readwrite/model/NodeIdString.go
index 64a6f1bf051..e252dc6ba93 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdString.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdTwoByte.go b/plc4go/protocols/opcua/readwrite/model/NodeIdTwoByte.go
index 3a7ec24d90b..ab021ab592a 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdTwoByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdTwoByte.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdType.go b/plc4go/protocols/opcua/readwrite/model/NodeIdType.go
index a09163970be..dae690e882d 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdType.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go b/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
index 3b0c53e073c..68626693bf9 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeIdTypeDefinition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeReference.go b/plc4go/protocols/opcua/readwrite/model/NodeReference.go
index b9e79246ca5..856cb92ee54 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeReference.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeReference.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NodeTypeDescription.go b/plc4go/protocols/opcua/readwrite/model/NodeTypeDescription.go
index 3b9a0dd045b..17b1ed42b97 100644
--- a/plc4go/protocols/opcua/readwrite/model/NodeTypeDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/NodeTypeDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NormalizedString.go b/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
index f27ed8150e6..a07b6004d19 100644
--- a/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
+++ b/plc4go/protocols/opcua/readwrite/model/NormalizedString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NotificationData.go b/plc4go/protocols/opcua/readwrite/model/NotificationData.go
index eccd0acec6b..7bb68de6a92 100644
--- a/plc4go/protocols/opcua/readwrite/model/NotificationData.go
+++ b/plc4go/protocols/opcua/readwrite/model/NotificationData.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NotificationMessage.go b/plc4go/protocols/opcua/readwrite/model/NotificationMessage.go
index e217f326e07..aa77eaf1e87 100644
--- a/plc4go/protocols/opcua/readwrite/model/NotificationMessage.go
+++ b/plc4go/protocols/opcua/readwrite/model/NotificationMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NullExtension.go b/plc4go/protocols/opcua/readwrite/model/NullExtension.go
index ddf465fcc00..de1a1c8d6b4 100644
--- a/plc4go/protocols/opcua/readwrite/model/NullExtension.go
+++ b/plc4go/protocols/opcua/readwrite/model/NullExtension.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go b/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
index bedcc145fcc..19a5204fcac 100644
--- a/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/NumericNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/NumericRange.go b/plc4go/protocols/opcua/readwrite/model/NumericRange.go
index cf2a02d61a8..97b8f855449 100644
--- a/plc4go/protocols/opcua/readwrite/model/NumericRange.go
+++ b/plc4go/protocols/opcua/readwrite/model/NumericRange.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go b/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
index e2062bee4c1..0414798c339 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaAPU.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -77,8 +79,6 @@ type OpcuaAPUBuilder interface {
 	WithMandatoryFields(message MessagePDU) OpcuaAPUBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(MessagePDU) OpcuaAPUBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(MessagePDUBuilder) MessagePDUBuilder) OpcuaAPUBuilder
 	// Build builds the OpcuaAPU or returns an error if something is wrong
 	Build() (OpcuaAPU, error)
 	// MustBuild does the same as Build but panics on error
@@ -107,19 +107,6 @@ func (m *_OpcuaAPUBuilder) WithMessage(message MessagePDU) OpcuaAPUBuilder {
 	return m
 }
 
-func (m *_OpcuaAPUBuilder) WithMessageBuilder(builderSupplier func(MessagePDUBuilder) MessagePDUBuilder) OpcuaAPUBuilder {
-	builder := builderSupplier(m.Message.CreateMessagePDUBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "MessagePDUBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaAPUBuilder) Build() (OpcuaAPU, error) {
 	if m.Message == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
index 69ede9388f4..e0d2f871fc5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaAcknowledgeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
index d18fd112b69..caa6ae45d34 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaCloseRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type OpcuaCloseRequestBuilder interface {
 	WithSecurityHeaderBuilder(func(SecurityHeaderBuilder) SecurityHeaderBuilder) OpcuaCloseRequestBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(Payload) OpcuaCloseRequestBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaCloseRequestBuilder
 	// Build builds the OpcuaCloseRequest or returns an error if something is wrong
 	Build() (OpcuaCloseRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_OpcuaCloseRequestBuilder) WithMessage(message Payload) OpcuaCloseReque
 	return m
 }
 
-func (m *_OpcuaCloseRequestBuilder) WithMessageBuilder(builderSupplier func(PayloadBuilder) PayloadBuilder) OpcuaCloseRequestBuilder {
-	builder := builderSupplier(m.Message.CreatePayloadBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaCloseRequestBuilder) Build() (OpcuaCloseRequest, error) {
 	if m.SecurityHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go b/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
index 5d087e7f92b..aaa41772f0d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaConstants.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaDataType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaDataType.go
index 063cf500bd7..3c66af92ea4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
index 80dd5ed8203..b46214c7261 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaHelloRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaIdentifierType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaIdentifierType.go
index 84129503975..08b33f75855 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaIdentifierType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaIdentifierType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
index c6a0acdbd47..d26c6f5c96e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
index 4e2621cd9f9..4feb6d81ac9 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type OpcuaMessageRequestBuilder interface {
 	WithSecurityHeaderBuilder(func(SecurityHeaderBuilder) SecurityHeaderBuilder) OpcuaMessageRequestBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(Payload) OpcuaMessageRequestBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaMessageRequestBuilder
 	// Build builds the OpcuaMessageRequest or returns an error if something is wrong
 	Build() (OpcuaMessageRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -142,19 +142,6 @@ func (m *_OpcuaMessageRequestBuilder) WithMessage(message Payload) OpcuaMessageR
 	return m
 }
 
-func (m *_OpcuaMessageRequestBuilder) WithMessageBuilder(builderSupplier func(PayloadBuilder) PayloadBuilder) OpcuaMessageRequestBuilder {
-	builder := builderSupplier(m.Message.CreatePayloadBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaMessageRequestBuilder) Build() (OpcuaMessageRequest, error) {
 	if m.SecurityHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
index a5475386851..defee0c2d31 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaMessageResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type OpcuaMessageResponseBuilder interface {
 	WithSecurityHeaderBuilder(func(SecurityHeaderBuilder) SecurityHeaderBuilder) OpcuaMessageResponseBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(Payload) OpcuaMessageResponseBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaMessageResponseBuilder
 	// Build builds the OpcuaMessageResponse or returns an error if something is wrong
 	Build() (OpcuaMessageResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -142,19 +142,6 @@ func (m *_OpcuaMessageResponseBuilder) WithMessage(message Payload) OpcuaMessage
 	return m
 }
 
-func (m *_OpcuaMessageResponseBuilder) WithMessageBuilder(builderSupplier func(PayloadBuilder) PayloadBuilder) OpcuaMessageResponseBuilder {
-	builder := builderSupplier(m.Message.CreatePayloadBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaMessageResponseBuilder) Build() (OpcuaMessageResponse, error) {
 	if m.SecurityHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesDataType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesDataType.go
index f84c0721103..57f65f88691 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesDataType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesMethod.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesMethod.go
index 4bfe37d9e51..3ecbce544bf 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesMethod.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesMethod.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObject.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObject.go
index 7640e1ad22b..c7428144022 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObject.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObjectType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObjectType.go
index bf2280a148d..00b1bb1b32c 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObjectType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesObjectType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesReferenceType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesReferenceType.go
index decbe371755..787da0c53a0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesReferenceType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesReferenceType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAccess.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAccess.go
index 2a921250991..e67929c9117 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAccess.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAccess.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAcknowledgeable.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAcknowledgeable.go
index fb6c1246e20..fab9435eb66 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAcknowledgeable.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAcknowledgeable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAdd.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAdd.go
index 5046a430813..518ae9064f6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAdd.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAdd.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAggregate.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAggregate.go
index f82bb9ed301..bba8b7c9b85 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAggregate.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAggregate.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlarm.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlarm.go
index 71600fde082..080338756da 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlarm.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlarm.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlias.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlias.go
index 833956bd08f..ed91df0d5f5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlias.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlias.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAliases.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAliases.go
index bf51f09cca7..f73d7b1b258 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAliases.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAliases.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAllow.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAllow.go
index 72ef1424ba9..7558fc5e268 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAllow.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAllow.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlternative.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlternative.go
index 355ededb4ef..e96c8be39bb 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlternative.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAlternative.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnalog.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnalog.go
index 9ddbcaa188e..e00ffd3b29f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnalog.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnalog.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnnotations.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnnotations.go
index bf1635eedbf..035378de1e4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnnotations.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAnnotations.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableApplication.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableApplication.go
index 3d0aff88a54..33499432ba6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableApplication.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableApplication.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableArray.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableArray.go
index d05feb31183..c59cc482b3c 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableArray.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableArray.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAttribute.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAttribute.go
index ab8fd2c74f4..90b4d7ac99b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAttribute.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAttribute.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudio.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudio.go
index ed3f01b9636..f0aef8a0118 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudio.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudio.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudit.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudit.go
index 0cf22a6e839..8c3ab598dfc 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudit.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAudit.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAuthorization.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAuthorization.go
index 78052605858..bf4afde4d7b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAuthorization.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAuthorization.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAxis.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAxis.go
index a9f2587df0a..0dc58655f71 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAxis.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableAxis.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBase.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBase.go
index b6a0c026ed3..5ff1640f976 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBase.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBase.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBit.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBit.go
index 8988f641a80..678d6ecb191 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBit.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBit.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBroker.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBroker.go
index 185e58dffc2..6f1afb39703 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBroker.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBroker.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBrowse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBrowse.go
index 69925c19bf3..8834dc167c0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBrowse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBrowse.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBuild.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBuild.go
index 26d1de043cf..e83ad6a069e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBuild.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableBuild.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCartesian.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCartesian.go
index a08974e747d..bd7077750eb 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCartesian.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCartesian.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCertificate.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCertificate.go
index da924733bd7..986da921fe1 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCertificate.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCertificate.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableChange.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableChange.go
index 45be5b25507..6e26a5b5d52 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableChange.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableChange.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableClose.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableClose.go
index 2d37a2f615e..d1222fc49f7 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableClose.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableClose.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCondition.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCondition.go
index fdf704079aa..2e85aeecba4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCondition.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCondition.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConnect.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConnect.go
index 47800b42102..c621868bc8b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConnect.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConnect.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConversion.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConversion.go
index 3ad6fd9bb55..57911e9e3d8 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConversion.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableConversion.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCreate.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCreate.go
index fdab192b3f9..053a7db9c1d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCreate.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCreate.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCube.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCube.go
index aeff4ee8bd9..da3125e362b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCube.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCube.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCurrency.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCurrency.go
index 24067e1f92c..8a72b44d396 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCurrency.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableCurrency.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableData.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableData.go
index 166375cb049..1b21c2d6ded 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableData.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableData.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDatagram.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDatagram.go
index da099b177cf..2598fe228f8 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDatagram.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDatagram.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDeadband.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDeadband.go
index 53db42cb425..835c6d1ba61 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDeadband.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDeadband.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDefault.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDefault.go
index bd1181e34d9..5125958a317 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDefault.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDefault.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDelete.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDelete.go
index cbb45b898b3..65b166b6463 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDelete.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDelete.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiagnostics.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiagnostics.go
index 7f9b90c635d..76b5eb6e370 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiagnostics.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiagnostics.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDialog.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDialog.go
index 53a36d8929c..289f8b80890 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDialog.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDialog.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDisconnect.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDisconnect.go
index ebe0dabcfdd..dd5479db460 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDisconnect.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDisconnect.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiscrepancy.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiscrepancy.go
index cad8195423c..dd1532a90ec 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiscrepancy.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDiscrepancy.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDuplex.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDuplex.go
index b68d32cb3ec..9045f5d626a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDuplex.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableDuplex.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEngineering.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEngineering.go
index cc7aea9da56..016d90842d1 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEngineering.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEngineering.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEnum.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEnum.go
index 02f4c199b87..b2d67920636 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEnum.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEnum.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEvent.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEvent.go
index 36498c22856..376142df527 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEvent.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableEvent.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableException.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableException.go
index 428ad6965f9..c4ef263a8a0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableException.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableException.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExclusive.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExclusive.go
index 4936b23fadc..8e3822e60b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExclusive.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExclusive.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExpression.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExpression.go
index 7b41f57945f..67ff4e75a9a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExpression.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExpression.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExtension.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExtension.go
index 74c36a528cc..ea551331435 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExtension.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableExtension.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFile.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFile.go
index 8d0bd9c5c4a..21f6b61dbd8 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFile.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFile.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFilter.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFilter.go
index 74166ada321..40b5924542b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFilter.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFilter.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFind.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFind.go
index 60ca3e4a6b9..9bbdc721b1b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFind.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFind.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFinite.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFinite.go
index e7a19b59dbb..4bc99eee7c4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFinite.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFinite.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFrame.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFrame.go
index f7d4be9826d..0b2bc5fc377 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFrame.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableFrame.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGeneral.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGeneral.go
index 1e0f931b6f8..c8f12cc3eac 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGeneral.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGeneral.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGenerate.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGenerate.go
index b8e994b2721..195e870f681 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGenerate.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGenerate.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGet.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGet.go
index e6d039db087..761cc79333b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGet.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableGet.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableH.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableH.go
index 5ba5669984c..62b819dc4a6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableH.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableH.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistorical.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistorical.go
index b5c2a32cb6c..649f67ae063 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistorical.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistorical.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistory.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistory.go
index cc24468ec92..e49556c5439 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistory.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableHistory.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableI.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableI.go
index a8eb80aba16..b7a24c5c063 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableI.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableI.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIcon.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIcon.go
index a9e8b5062f1..24e4f9d3fae 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIcon.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIcon.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableId.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableId.go
index 2a5cbf746b4..dd2f3eecb2b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableId.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableId.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIdentity.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIdentity.go
index ddf8d3bb881..003d350a072 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIdentity.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIdentity.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIetf.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIetf.go
index 7c1cfb937df..3333149b073 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIetf.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableIetf.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableImage.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableImage.go
index 251c699ae0e..6e84276982b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableImage.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableImage.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInput.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInput.go
index 14c4abb7174..382d40615b5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInput.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInput.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInterface.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInterface.go
index f288edc5f0a..4f4f94fd555 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInterface.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableInterface.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableJson.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableJson.go
index c7866959add..0beba6bb147 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableJson.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableJson.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableKey.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableKey.go
index b996ad4428f..94345e3e4fb 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableKey.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableKey.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLimit.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLimit.go
index c7228cad4c2..dfc205c3c57 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLimit.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLimit.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLocal.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLocal.go
index db5a64052b9..659a833402c 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLocal.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableLocal.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMax.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMax.go
index 3d0560c4392..948713c396f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMax.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMax.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMessage.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMessage.go
index 385b1a4f992..636783c2467 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMessage.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMessage.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModel.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModel.go
index c3cf8d6ec1a..6e222cb4cec 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModel.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModel.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModify.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModify.go
index e7312ba726c..4cbf02ef8e5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModify.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableModify.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMonitoring.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMonitoring.go
index 33e7bfca084..8f7e19496a9 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMonitoring.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMonitoring.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMove.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMove.go
index 03a8839d8ff..8ac35439634 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMove.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMove.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMulti.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMulti.go
index 28af93f3a2e..ea5dbc3d486 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMulti.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableMulti.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableN.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableN.go
index e9247ac6538..2eca1892d80 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableN.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableN.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespace.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespace.go
index f778b8fff11..1e5bda44e24 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespace.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespace.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespaces.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespaces.go
index a9376429b68..9f160fa2c4d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespaces.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNamespaces.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNaming.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNaming.go
index 83c269ab252..4efeabb1601 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNaming.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNaming.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNegotiation.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNegotiation.go
index 71479115632..c5591fece45 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNegotiation.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNegotiation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNetwork.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNetwork.go
index fed42d2c8a3..982276f1d73 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNetwork.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNetwork.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNode.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNode.go
index 3ecf3868936..2455bf19ee6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNode.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNon.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNon.go
index 22f6d156d24..538e0d1ed55 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNon.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableNon.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableO.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableO.go
index 5b23c749bf0..e0e5316361d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableO.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableO.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOff.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOff.go
index dbc54b2361c..a5f1c3101aa 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOff.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOff.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpc.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpc.go
index e2555df873f..4c53a0a35c5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpc.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpc.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpen.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpen.go
index 262a2085ce0..dc0fbc0e3f3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpen.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOpen.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOperation.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOperation.go
index 6cc227b6c25..057144ad4e4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOperation.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOperation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOption.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOption.go
index 1b0e54ddb6f..3f2d9236758 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOption.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOption.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrdered.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrdered.go
index 4620d22bf73..fceb5a544e3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrdered.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrdered.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrientation.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrientation.go
index 5b9b0223ff2..7fa57e8b075 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrientation.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOrientation.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOutput.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOutput.go
index d0c0df32381..4217b4dd669 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOutput.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOutput.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOverride.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOverride.go
index a7364db16ed..f38feab8a2b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOverride.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableOverride.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePassword.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePassword.go
index e9ca49ad99a..fe3ee118508 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePassword.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePassword.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePerform.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePerform.go
index 7563ba50b43..0c1081f7dea 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePerform.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePerform.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePermission.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePermission.go
index a9aa52ff68c..2f7b72ae842 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePermission.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePermission.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePriority.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePriority.go
index c44fc7d6f76..3a1e051b320 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePriority.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePriority.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgram.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgram.go
index 55b65fdf90d..c72d5f65cc3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgram.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgram.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgress.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgress.go
index 042445a7c71..74d14970b64 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgress.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProgress.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProvisionable.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProvisionable.go
index ad100b4ead3..5873de7a06c 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProvisionable.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableProvisionable.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePub.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePub.go
index 09fdae7ce01..07a3a54cd60 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePub.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePub.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublish.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublish.go
index 4263632095d..c79691eccff 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublish.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublish.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublished.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublished.go
index 4ef31e1c704..0642547772a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublished.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariablePublished.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantities.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantities.go
index 7c99f79037f..44fcb826bf9 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantities.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantities.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantity.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantity.go
index 5ac4771eff3..82e314e4746 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantity.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableQuantity.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRational.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRational.go
index cd3c0396d39..c78a27b9015 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRational.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRational.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRead.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRead.go
index 215b28e4e3b..a97ad65abac 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRead.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRead.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReader.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReader.go
index e3a8bbb4968..a2edfdd51f0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReader.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReader.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundancy.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundancy.go
index 6e5d4311fca..7d823d76478 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundancy.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundancy.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundant.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundant.go
index c99f6b40117..11de5a113ba 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundant.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRedundant.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReference.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReference.go
index ec7713360ba..b424ea73dd3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReference.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableReference.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRemove.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRemove.go
index e4f76c6d9e1..4dacfb6fc48 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRemove.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRemove.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRequest.go
index d92df995d70..829c1d3afad 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRequest.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableResend.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableResend.go
index 358fe875990..1e0426f6e6e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableResend.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableResend.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRole.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRole.go
index 5949540e622..1a6ba6ea7da 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRole.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableRole.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSampling.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSampling.go
index 060de775528..690b55be57e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSampling.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSampling.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSecurity.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSecurity.go
index 5bd50e54422..6817eabd690 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSecurity.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSecurity.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSelection.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSelection.go
index 8bee22236b8..c3d7b20ea47 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSelection.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSelection.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSemantic.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSemantic.go
index a5b6ff88e89..082b8640a46 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSemantic.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSemantic.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableServer.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableServer.go
index 8a70954436e..03da26ed63f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableServer.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableServer.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSession.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSession.go
index 126e9153c78..a426056cd86 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSession.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSession.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSessions.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSessions.go
index 93d15effc76..58e2c15ba50 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSessions.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSessions.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSet.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSet.go
index ec21c991ab6..fd13865691e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSet.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSet.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableShelved.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableShelved.go
index c6c7fef1eb1..467e7ab2bd7 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableShelved.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableShelved.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStandalone.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStandalone.go
index 91684c0c9d9..53f6d8ab245 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStandalone.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStandalone.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableState.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableState.go
index 8907e43e27e..f2d7d2aed8f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableState.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStructure.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStructure.go
index 46ffd0aa8a6..67d46d2b23a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStructure.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableStructure.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscribed.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscribed.go
index ca5b45508a7..2acd0d234cd 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscribed.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscribed.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscription.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscription.go
index 93dcebe4fef..ae783c614d6 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscription.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSubscription.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSyntax.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSyntax.go
index 624622f151f..bed8ba5ab8d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSyntax.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSyntax.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSystem.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSystem.go
index cd3d42c8f5f..64dbfa56323 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSystem.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableSystem.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTag.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTag.go
index 69e9ddab639..eb915687b07 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTag.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTag.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTarget.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTarget.go
index 4ebcaaaeaaa..b02d0ba3171 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTarget.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTarget.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTemporary.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTemporary.go
index 9d38c42940e..144a1e28384 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTemporary.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTemporary.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableThree.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableThree.go
index a578e890bd9..f0a8ee3f688 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableThree.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableThree.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimed.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimed.go
index 371046ff1b8..00c5c0410e0 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimed.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimed.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimestamps.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimestamps.go
index 7141604670e..25c265cc6ba 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimestamps.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTimestamps.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTopics.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTopics.go
index 5dcbca5714e..552201a28f3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTopics.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTopics.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransaction.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransaction.go
index cb8b2284339..2b8fe5561de 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransaction.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransaction.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransition.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransition.go
index 8b95309cc7f..7bba82b3765 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransition.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransition.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransparent.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransparent.go
index 0d576323c0d..dd91692ca18 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransparent.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTransparent.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTrust.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTrust.go
index 2f8f72c3c21..85febc6613b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTrust.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTrust.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTsn.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTsn.go
index a076c37e685..23c59192e83 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTsn.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTsn.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTwo.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTwo.go
index 060cbba988e..59e266e0aca 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTwo.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableTwo.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableType.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableType.go
index de66df77568..3b5737fe646 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableType.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUadp.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUadp.go
index 58bd3738fac..e696b6f6b13 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUadp.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUadp.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUnit.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUnit.go
index d83a617ca8f..4b9d31d3a3a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUnit.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUnit.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUpdate.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUpdate.go
index 7e4929d1634..8af8bbc60de 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUpdate.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUpdate.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUser.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUser.go
index 10c7cfe6b54..0081df08f0b 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUser.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableUser.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableValue.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableValue.go
index df5fbbfbf59..db111ad6a4d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableValue.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableVector.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableVector.go
index 53daa86d4f0..a509c430595 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableVector.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableVector.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableView.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableView.go
index 1b6fdf56810..0fde26bac46 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableView.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableView.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWell.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWell.go
index 2a57f6eb12c..4b4099aabcf 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWell.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWell.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWith.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWith.go
index 688009649c6..ca1046e8279 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWith.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWith.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWrite.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWrite.go
index e548b0b8d9b..d7435516fbb 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWrite.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWrite.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWriter.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWriter.go
index a14d2aa61e6..633fc595a1f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWriter.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableWriter.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableX.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableX.go
index ee20cd480c3..811bc742e6f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableX.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableX.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableY.go b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableY.go
index 9fec876d362..acdac72e984 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableY.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaNodeIdServicesVariableY.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
index fe9493a3362..9424deebaf4 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -90,12 +92,8 @@ type OpcuaOpenRequestBuilder interface {
 	WithMandatoryFields(openRequest OpenChannelMessage, message Payload) OpcuaOpenRequestBuilder
 	// WithOpenRequest adds OpenRequest (property field)
 	WithOpenRequest(OpenChannelMessage) OpcuaOpenRequestBuilder
-	// WithOpenRequestBuilder adds OpenRequest (property field) which is build by the builder
-	WithOpenRequestBuilder(func(OpenChannelMessageBuilder) OpenChannelMessageBuilder) OpcuaOpenRequestBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(Payload) OpcuaOpenRequestBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaOpenRequestBuilder
 	// Build builds the OpcuaOpenRequest or returns an error if something is wrong
 	Build() (OpcuaOpenRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -124,37 +122,11 @@ func (m *_OpcuaOpenRequestBuilder) WithOpenRequest(openRequest OpenChannelMessag
 	return m
 }
 
-func (m *_OpcuaOpenRequestBuilder) WithOpenRequestBuilder(builderSupplier func(OpenChannelMessageBuilder) OpenChannelMessageBuilder) OpcuaOpenRequestBuilder {
-	builder := builderSupplier(m.OpenRequest.CreateOpenChannelMessageBuilder())
-	var err error
-	m.OpenRequest, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "OpenChannelMessageBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaOpenRequestBuilder) WithMessage(message Payload) OpcuaOpenRequestBuilder {
 	m.Message = message
 	return m
 }
 
-func (m *_OpcuaOpenRequestBuilder) WithMessageBuilder(builderSupplier func(PayloadBuilder) PayloadBuilder) OpcuaOpenRequestBuilder {
-	builder := builderSupplier(m.Message.CreatePayloadBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaOpenRequestBuilder) Build() (OpcuaOpenRequest, error) {
 	if m.OpenRequest == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
index 542fc134e07..d2cdb74768f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaOpenResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -90,12 +92,8 @@ type OpcuaOpenResponseBuilder interface {
 	WithMandatoryFields(openResponse OpenChannelMessage, message Payload) OpcuaOpenResponseBuilder
 	// WithOpenResponse adds OpenResponse (property field)
 	WithOpenResponse(OpenChannelMessage) OpcuaOpenResponseBuilder
-	// WithOpenResponseBuilder adds OpenResponse (property field) which is build by the builder
-	WithOpenResponseBuilder(func(OpenChannelMessageBuilder) OpenChannelMessageBuilder) OpcuaOpenResponseBuilder
 	// WithMessage adds Message (property field)
 	WithMessage(Payload) OpcuaOpenResponseBuilder
-	// WithMessageBuilder adds Message (property field) which is build by the builder
-	WithMessageBuilder(func(PayloadBuilder) PayloadBuilder) OpcuaOpenResponseBuilder
 	// Build builds the OpcuaOpenResponse or returns an error if something is wrong
 	Build() (OpcuaOpenResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -124,37 +122,11 @@ func (m *_OpcuaOpenResponseBuilder) WithOpenResponse(openResponse OpenChannelMes
 	return m
 }
 
-func (m *_OpcuaOpenResponseBuilder) WithOpenResponseBuilder(builderSupplier func(OpenChannelMessageBuilder) OpenChannelMessageBuilder) OpcuaOpenResponseBuilder {
-	builder := builderSupplier(m.OpenResponse.CreateOpenChannelMessageBuilder())
-	var err error
-	m.OpenResponse, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "OpenChannelMessageBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaOpenResponseBuilder) WithMessage(message Payload) OpcuaOpenResponseBuilder {
 	m.Message = message
 	return m
 }
 
-func (m *_OpcuaOpenResponseBuilder) WithMessageBuilder(builderSupplier func(PayloadBuilder) PayloadBuilder) OpcuaOpenResponseBuilder {
-	builder := builderSupplier(m.Message.CreatePayloadBuilder())
-	var err error
-	m.Message, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpcuaOpenResponseBuilder) Build() (OpcuaOpenResponse, error) {
 	if m.OpenResponse == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go b/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
index 129bcc2b733..62f008c2274 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaProtocolLimits.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaStatusCode.go b/plc4go/protocols/opcua/readwrite/model/OpcuaStatusCode.go
index 0538cd2be07..d0f870abb95 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaStatusCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaStatusCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpcuaVector.go b/plc4go/protocols/opcua/readwrite/model/OpcuaVector.go
index 07fa67535bd..5d1c31b3bd3 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpcuaVector.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpcuaVector.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
index 75726f23710..7452d878dba 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessage.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageRequest.go b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageRequest.go
index b24878cb426..49d1f9ebafd 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageResponse.go b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageResponse.go
index f62e19df1a7..438987426f5 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenChannelMessageResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenFileMode.go b/plc4go/protocols/opcua/readwrite/model/OpenFileMode.go
index 7789ae2ac09..7754d7cc12e 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenFileMode.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenFileMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelRequest.go b/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelRequest.go
index 5d12e6497f5..5e309c0a44d 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -103,8 +105,6 @@ type OpenSecureChannelRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, clientProtocolVersion uint32, requestType SecurityTokenRequestType, securityMode MessageSecurityMode, clientNonce PascalByteString, requestedLifetime uint32) OpenSecureChannelRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) OpenSecureChannelRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelRequestBuilder
 	// WithClientProtocolVersion adds ClientProtocolVersion (property field)
 	WithClientProtocolVersion(uint32) OpenSecureChannelRequestBuilder
 	// WithRequestType adds RequestType (property field)
@@ -145,19 +145,6 @@ func (m *_OpenSecureChannelRequestBuilder) WithRequestHeader(requestHeader Exten
 	return m
 }
 
-func (m *_OpenSecureChannelRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpenSecureChannelRequestBuilder) WithClientProtocolVersion(clientProtocolVersion uint32) OpenSecureChannelRequestBuilder {
 	m.ClientProtocolVersion = clientProtocolVersion
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelResponse.go b/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelResponse.go
index 378c0f3c88a..2e47160d93f 100644
--- a/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/OpenSecureChannelResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -98,14 +100,10 @@ type OpenSecureChannelResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, serverProtocolVersion uint32, securityToken ExtensionObjectDefinition, serverNonce PascalByteString) OpenSecureChannelResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) OpenSecureChannelResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelResponseBuilder
 	// WithServerProtocolVersion adds ServerProtocolVersion (property field)
 	WithServerProtocolVersion(uint32) OpenSecureChannelResponseBuilder
 	// WithSecurityToken adds SecurityToken (property field)
 	WithSecurityToken(ExtensionObjectDefinition) OpenSecureChannelResponseBuilder
-	// WithSecurityTokenBuilder adds SecurityToken (property field) which is build by the builder
-	WithSecurityTokenBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelResponseBuilder
 	// WithServerNonce adds ServerNonce (property field)
 	WithServerNonce(PascalByteString) OpenSecureChannelResponseBuilder
 	// WithServerNonceBuilder adds ServerNonce (property field) which is build by the builder
@@ -138,19 +136,6 @@ func (m *_OpenSecureChannelResponseBuilder) WithResponseHeader(responseHeader Ex
 	return m
 }
 
-func (m *_OpenSecureChannelResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpenSecureChannelResponseBuilder) WithServerProtocolVersion(serverProtocolVersion uint32) OpenSecureChannelResponseBuilder {
 	m.ServerProtocolVersion = serverProtocolVersion
 	return m
@@ -161,19 +146,6 @@ func (m *_OpenSecureChannelResponseBuilder) WithSecurityToken(securityToken Exte
 	return m
 }
 
-func (m *_OpenSecureChannelResponseBuilder) WithSecurityTokenBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) OpenSecureChannelResponseBuilder {
-	builder := builderSupplier(m.SecurityToken.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.SecurityToken, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_OpenSecureChannelResponseBuilder) WithServerNonce(serverNonce PascalByteString) OpenSecureChannelResponseBuilder {
 	m.ServerNonce = serverNonce
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/OptionSet.go b/plc4go/protocols/opcua/readwrite/model/OptionSet.go
index 9fb79b1cb0a..8fcad422ec9 100644
--- a/plc4go/protocols/opcua/readwrite/model/OptionSet.go
+++ b/plc4go/protocols/opcua/readwrite/model/OptionSet.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Orientation.go b/plc4go/protocols/opcua/readwrite/model/Orientation.go
index bebfef0cad8..a9b61f3e24a 100644
--- a/plc4go/protocols/opcua/readwrite/model/Orientation.go
+++ b/plc4go/protocols/opcua/readwrite/model/Orientation.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/OverrideValueHandling.go b/plc4go/protocols/opcua/readwrite/model/OverrideValueHandling.go
index 980bcb8fbb9..d57a598074a 100644
--- a/plc4go/protocols/opcua/readwrite/model/OverrideValueHandling.go
+++ b/plc4go/protocols/opcua/readwrite/model/OverrideValueHandling.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ParsingResult.go b/plc4go/protocols/opcua/readwrite/model/ParsingResult.go
index 8ddf2619798..ee46889f72b 100644
--- a/plc4go/protocols/opcua/readwrite/model/ParsingResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/ParsingResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PascalByteString.go b/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
index f72acf760bc..f386609ace6 100644
--- a/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
+++ b/plc4go/protocols/opcua/readwrite/model/PascalByteString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PascalString.go b/plc4go/protocols/opcua/readwrite/model/PascalString.go
index 1de7ff4f111..f584b7a0610 100644
--- a/plc4go/protocols/opcua/readwrite/model/PascalString.go
+++ b/plc4go/protocols/opcua/readwrite/model/PascalString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PasswordOptionsMask.go b/plc4go/protocols/opcua/readwrite/model/PasswordOptionsMask.go
index a7627565c2a..e22f6345dd0 100644
--- a/plc4go/protocols/opcua/readwrite/model/PasswordOptionsMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/PasswordOptionsMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Payload.go b/plc4go/protocols/opcua/readwrite/model/Payload.go
index 164f53e468d..230b17013f6 100644
--- a/plc4go/protocols/opcua/readwrite/model/Payload.go
+++ b/plc4go/protocols/opcua/readwrite/model/Payload.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PerformUpdateType.go b/plc4go/protocols/opcua/readwrite/model/PerformUpdateType.go
index 6f61d28a243..1d520e70bb7 100644
--- a/plc4go/protocols/opcua/readwrite/model/PerformUpdateType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PerformUpdateType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PermissionType.go b/plc4go/protocols/opcua/readwrite/model/PermissionType.go
index dfda16a13e3..315fac6a432 100644
--- a/plc4go/protocols/opcua/readwrite/model/PermissionType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PermissionType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PortableQualifiedName.go b/plc4go/protocols/opcua/readwrite/model/PortableQualifiedName.go
index 4e4f2e5a2b8..6c2a730ebe4 100644
--- a/plc4go/protocols/opcua/readwrite/model/PortableQualifiedName.go
+++ b/plc4go/protocols/opcua/readwrite/model/PortableQualifiedName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PriorityMappingEntryType.go b/plc4go/protocols/opcua/readwrite/model/PriorityMappingEntryType.go
index f0bbb10af3f..720244b19eb 100644
--- a/plc4go/protocols/opcua/readwrite/model/PriorityMappingEntryType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PriorityMappingEntryType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ProgramDiagnostic2DataType.go b/plc4go/protocols/opcua/readwrite/model/ProgramDiagnostic2DataType.go
index 74c6c2b0b85..ffede80247f 100644
--- a/plc4go/protocols/opcua/readwrite/model/ProgramDiagnostic2DataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ProgramDiagnostic2DataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ProgramDiagnosticDataType.go b/plc4go/protocols/opcua/readwrite/model/ProgramDiagnosticDataType.go
index 9755d38586d..5390bd29691 100644
--- a/plc4go/protocols/opcua/readwrite/model/ProgramDiagnosticDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ProgramDiagnosticDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -166,8 +168,6 @@ type ProgramDiagnosticDataTypeBuilder interface {
 	WithLastMethodCallTime(int64) ProgramDiagnosticDataTypeBuilder
 	// WithLastMethodReturnStatus adds LastMethodReturnStatus (property field)
 	WithLastMethodReturnStatus(ExtensionObjectDefinition) ProgramDiagnosticDataTypeBuilder
-	// WithLastMethodReturnStatusBuilder adds LastMethodReturnStatus (property field) which is build by the builder
-	WithLastMethodReturnStatusBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ProgramDiagnosticDataTypeBuilder
 	// Build builds the ProgramDiagnosticDataType or returns an error if something is wrong
 	Build() (ProgramDiagnosticDataType, error)
 	// MustBuild does the same as Build but panics on error
@@ -303,19 +303,6 @@ func (m *_ProgramDiagnosticDataTypeBuilder) WithLastMethodReturnStatus(lastMetho
 	return m
 }
 
-func (m *_ProgramDiagnosticDataTypeBuilder) WithLastMethodReturnStatusBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ProgramDiagnosticDataTypeBuilder {
-	builder := builderSupplier(m.LastMethodReturnStatus.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.LastMethodReturnStatus, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ProgramDiagnosticDataTypeBuilder) Build() (ProgramDiagnosticDataType, error) {
 	if m.CreateSessionId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationDataType.go b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationDataType.go
index 9a2f7b023b1..99132f5ff6c 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefDataType.go b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefDataType.go
index 6b562172553..07e66d0d9cd 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefMask.go b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefMask.go
index e17ad6ecccf..dbc2300edc9 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubConfigurationRefMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubConnectionDataType.go b/plc4go/protocols/opcua/readwrite/model/PubSubConnectionDataType.go
index 5c178d144bd..8274997de89 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubConnectionDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubConnectionDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -144,8 +146,6 @@ type PubSubConnectionDataTypeBuilder interface {
 	WithEnabled(bool) PubSubConnectionDataTypeBuilder
 	// WithPublisherId adds PublisherId (property field)
 	WithPublisherId(Variant) PubSubConnectionDataTypeBuilder
-	// WithPublisherIdBuilder adds PublisherId (property field) which is build by the builder
-	WithPublisherIdBuilder(func(VariantBuilder) VariantBuilder) PubSubConnectionDataTypeBuilder
 	// WithTransportProfileUri adds TransportProfileUri (property field)
 	WithTransportProfileUri(PascalString) PubSubConnectionDataTypeBuilder
 	// WithTransportProfileUriBuilder adds TransportProfileUri (property field) which is build by the builder
@@ -221,19 +221,6 @@ func (m *_PubSubConnectionDataTypeBuilder) WithPublisherId(publisherId Variant)
 	return m
 }
 
-func (m *_PubSubConnectionDataTypeBuilder) WithPublisherIdBuilder(builderSupplier func(VariantBuilder) VariantBuilder) PubSubConnectionDataTypeBuilder {
-	builder := builderSupplier(m.PublisherId.CreateVariantBuilder())
-	var err error
-	m.PublisherId, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PubSubConnectionDataTypeBuilder) WithTransportProfileUri(transportProfileUri PascalString) PubSubConnectionDataTypeBuilder {
 	m.TransportProfileUri = transportProfileUri
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubDiagnosticsCounterClassification.go b/plc4go/protocols/opcua/readwrite/model/PubSubDiagnosticsCounterClassification.go
index c6ff782fde8..02bfbf2a48d 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubDiagnosticsCounterClassification.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubDiagnosticsCounterClassification.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubGroupDataType.go b/plc4go/protocols/opcua/readwrite/model/PubSubGroupDataType.go
index f4d4294e22e..d4178797920 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubGroupDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubGroupDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubKeyPushTargetDataType.go b/plc4go/protocols/opcua/readwrite/model/PubSubKeyPushTargetDataType.go
index 5653f2f78e4..4cc557f37f7 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubKeyPushTargetDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubKeyPushTargetDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -149,8 +151,6 @@ type PubSubKeyPushTargetDataTypeBuilder interface {
 	WithSecurityPolicyUriBuilder(func(PascalStringBuilder) PascalStringBuilder) PubSubKeyPushTargetDataTypeBuilder
 	// WithUserTokenType adds UserTokenType (property field)
 	WithUserTokenType(ExtensionObjectDefinition) PubSubKeyPushTargetDataTypeBuilder
-	// WithUserTokenTypeBuilder adds UserTokenType (property field) which is build by the builder
-	WithUserTokenTypeBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PubSubKeyPushTargetDataTypeBuilder
 	// WithRequestedKeyCount adds RequestedKeyCount (property field)
 	WithRequestedKeyCount(uint16) PubSubKeyPushTargetDataTypeBuilder
 	// WithRetryInterval adds RetryInterval (property field)
@@ -255,19 +255,6 @@ func (m *_PubSubKeyPushTargetDataTypeBuilder) WithUserTokenType(userTokenType Ex
 	return m
 }
 
-func (m *_PubSubKeyPushTargetDataTypeBuilder) WithUserTokenTypeBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PubSubKeyPushTargetDataTypeBuilder {
-	builder := builderSupplier(m.UserTokenType.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.UserTokenType, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PubSubKeyPushTargetDataTypeBuilder) WithRequestedKeyCount(requestedKeyCount uint16) PubSubKeyPushTargetDataTypeBuilder {
 	m.RequestedKeyCount = requestedKeyCount
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/PubSubState.go b/plc4go/protocols/opcua/readwrite/model/PubSubState.go
index 46e833b0640..26cef5051c3 100644
--- a/plc4go/protocols/opcua/readwrite/model/PubSubState.go
+++ b/plc4go/protocols/opcua/readwrite/model/PubSubState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PublishRequest.go b/plc4go/protocols/opcua/readwrite/model/PublishRequest.go
index 7e79709bf96..a1827e8691a 100644
--- a/plc4go/protocols/opcua/readwrite/model/PublishRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/PublishRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type PublishRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfSubscriptionAcknowledgements int32, subscriptionAcknowledgements []ExtensionObjectDefinition) PublishRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) PublishRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishRequestBuilder
 	// WithNoOfSubscriptionAcknowledgements adds NoOfSubscriptionAcknowledgements (property field)
 	WithNoOfSubscriptionAcknowledgements(int32) PublishRequestBuilder
 	// WithSubscriptionAcknowledgements adds SubscriptionAcknowledgements (property field)
@@ -122,19 +122,6 @@ func (m *_PublishRequestBuilder) WithRequestHeader(requestHeader ExtensionObject
 	return m
 }
 
-func (m *_PublishRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PublishRequestBuilder) WithNoOfSubscriptionAcknowledgements(noOfSubscriptionAcknowledgements int32) PublishRequestBuilder {
 	m.NoOfSubscriptionAcknowledgements = noOfSubscriptionAcknowledgements
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/PublishResponse.go b/plc4go/protocols/opcua/readwrite/model/PublishResponse.go
index 78b8fd54389..9557ce9e4b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/PublishResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/PublishResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -121,8 +123,6 @@ type PublishResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, subscriptionId uint32, noOfAvailableSequenceNumbers int32, availableSequenceNumbers []uint32, moreNotifications bool, notificationMessage ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) PublishResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) PublishResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishResponseBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) PublishResponseBuilder
 	// WithNoOfAvailableSequenceNumbers adds NoOfAvailableSequenceNumbers (property field)
@@ -133,8 +133,6 @@ type PublishResponseBuilder interface {
 	WithMoreNotifications(bool) PublishResponseBuilder
 	// WithNotificationMessage adds NotificationMessage (property field)
 	WithNotificationMessage(ExtensionObjectDefinition) PublishResponseBuilder
-	// WithNotificationMessageBuilder adds NotificationMessage (property field) which is build by the builder
-	WithNotificationMessageBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) PublishResponseBuilder
 	// WithResults adds Results (property field)
@@ -171,19 +169,6 @@ func (m *_PublishResponseBuilder) WithResponseHeader(responseHeader ExtensionObj
 	return m
 }
 
-func (m *_PublishResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PublishResponseBuilder) WithSubscriptionId(subscriptionId uint32) PublishResponseBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
@@ -209,19 +194,6 @@ func (m *_PublishResponseBuilder) WithNotificationMessage(notificationMessage Ex
 	return m
 }
 
-func (m *_PublishResponseBuilder) WithNotificationMessageBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) PublishResponseBuilder {
-	builder := builderSupplier(m.NotificationMessage.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.NotificationMessage, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PublishResponseBuilder) WithNoOfResults(noOfResults int32) PublishResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/PublishedDataSetSourceDataType.go b/plc4go/protocols/opcua/readwrite/model/PublishedDataSetSourceDataType.go
index 2e0af921254..de2e6833547 100644
--- a/plc4go/protocols/opcua/readwrite/model/PublishedDataSetSourceDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PublishedDataSetSourceDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/PublishedVariableDataType.go b/plc4go/protocols/opcua/readwrite/model/PublishedVariableDataType.go
index f79bb25d361..d8336332ed9 100644
--- a/plc4go/protocols/opcua/readwrite/model/PublishedVariableDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/PublishedVariableDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -134,8 +136,6 @@ type PublishedVariableDataTypeBuilder interface {
 	WithIndexRangeBuilder(func(PascalStringBuilder) PascalStringBuilder) PublishedVariableDataTypeBuilder
 	// WithSubstituteValue adds SubstituteValue (property field)
 	WithSubstituteValue(Variant) PublishedVariableDataTypeBuilder
-	// WithSubstituteValueBuilder adds SubstituteValue (property field) which is build by the builder
-	WithSubstituteValueBuilder(func(VariantBuilder) VariantBuilder) PublishedVariableDataTypeBuilder
 	// WithNoOfMetaDataProperties adds NoOfMetaDataProperties (property field)
 	WithNoOfMetaDataProperties(int32) PublishedVariableDataTypeBuilder
 	// WithMetaDataProperties adds MetaDataProperties (property field)
@@ -224,19 +224,6 @@ func (m *_PublishedVariableDataTypeBuilder) WithSubstituteValue(substituteValue
 	return m
 }
 
-func (m *_PublishedVariableDataTypeBuilder) WithSubstituteValueBuilder(builderSupplier func(VariantBuilder) VariantBuilder) PublishedVariableDataTypeBuilder {
-	builder := builderSupplier(m.SubstituteValue.CreateVariantBuilder())
-	var err error
-	m.SubstituteValue, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "VariantBuilder failed"))
-	}
-	return m
-}
-
 func (m *_PublishedVariableDataTypeBuilder) WithNoOfMetaDataProperties(noOfMetaDataProperties int32) PublishedVariableDataTypeBuilder {
 	m.NoOfMetaDataProperties = noOfMetaDataProperties
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/QosDataType.go b/plc4go/protocols/opcua/readwrite/model/QosDataType.go
index 3e6b3e7888c..c07db1728f0 100644
--- a/plc4go/protocols/opcua/readwrite/model/QosDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/QosDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/QualifiedName.go b/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
index 6c0ed090518..4bd4640c9c9 100644
--- a/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
+++ b/plc4go/protocols/opcua/readwrite/model/QualifiedName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/QuantityDimension.go b/plc4go/protocols/opcua/readwrite/model/QuantityDimension.go
index 5afdb37e582..56564677675 100644
--- a/plc4go/protocols/opcua/readwrite/model/QuantityDimension.go
+++ b/plc4go/protocols/opcua/readwrite/model/QuantityDimension.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryDataDescription.go b/plc4go/protocols/opcua/readwrite/model/QueryDataDescription.go
index aabad6fa77b..abae07b90d4 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryDataDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryDataDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type QueryDataDescriptionBuilder interface {
 	WithMandatoryFields(relativePath ExtensionObjectDefinition, attributeId uint32, indexRange PascalString) QueryDataDescriptionBuilder
 	// WithRelativePath adds RelativePath (property field)
 	WithRelativePath(ExtensionObjectDefinition) QueryDataDescriptionBuilder
-	// WithRelativePathBuilder adds RelativePath (property field) which is build by the builder
-	WithRelativePathBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryDataDescriptionBuilder
 	// WithAttributeId adds AttributeId (property field)
 	WithAttributeId(uint32) QueryDataDescriptionBuilder
 	// WithIndexRange adds IndexRange (property field)
@@ -127,19 +127,6 @@ func (m *_QueryDataDescriptionBuilder) WithRelativePath(relativePath ExtensionOb
 	return m
 }
 
-func (m *_QueryDataDescriptionBuilder) WithRelativePathBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryDataDescriptionBuilder {
-	builder := builderSupplier(m.RelativePath.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RelativePath, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryDataDescriptionBuilder) WithAttributeId(attributeId uint32) QueryDataDescriptionBuilder {
 	m.AttributeId = attributeId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryDataSet.go b/plc4go/protocols/opcua/readwrite/model/QueryDataSet.go
index d4a5f4cf2d4..09055dffbe6 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryDataSet.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryDataSet.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryFirstRequest.go b/plc4go/protocols/opcua/readwrite/model/QueryFirstRequest.go
index 7ac8f9a8064..c1dd36a9140 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryFirstRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryFirstRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -110,20 +112,14 @@ type QueryFirstRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, view ExtensionObjectDefinition, noOfNodeTypes int32, nodeTypes []ExtensionObjectDefinition, filter ExtensionObjectDefinition, maxDataSetsToReturn uint32, maxReferencesToReturn uint32) QueryFirstRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) QueryFirstRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder
 	// WithView adds View (property field)
 	WithView(ExtensionObjectDefinition) QueryFirstRequestBuilder
-	// WithViewBuilder adds View (property field) which is build by the builder
-	WithViewBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder
 	// WithNoOfNodeTypes adds NoOfNodeTypes (property field)
 	WithNoOfNodeTypes(int32) QueryFirstRequestBuilder
 	// WithNodeTypes adds NodeTypes (property field)
 	WithNodeTypes(...ExtensionObjectDefinition) QueryFirstRequestBuilder
 	// WithFilter adds Filter (property field)
 	WithFilter(ExtensionObjectDefinition) QueryFirstRequestBuilder
-	// WithFilterBuilder adds Filter (property field) which is build by the builder
-	WithFilterBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder
 	// WithMaxDataSetsToReturn adds MaxDataSetsToReturn (property field)
 	WithMaxDataSetsToReturn(uint32) QueryFirstRequestBuilder
 	// WithMaxReferencesToReturn adds MaxReferencesToReturn (property field)
@@ -156,37 +152,11 @@ func (m *_QueryFirstRequestBuilder) WithRequestHeader(requestHeader ExtensionObj
 	return m
 }
 
-func (m *_QueryFirstRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryFirstRequestBuilder) WithView(view ExtensionObjectDefinition) QueryFirstRequestBuilder {
 	m.View = view
 	return m
 }
 
-func (m *_QueryFirstRequestBuilder) WithViewBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder {
-	builder := builderSupplier(m.View.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.View, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryFirstRequestBuilder) WithNoOfNodeTypes(noOfNodeTypes int32) QueryFirstRequestBuilder {
 	m.NoOfNodeTypes = noOfNodeTypes
 	return m
@@ -202,19 +172,6 @@ func (m *_QueryFirstRequestBuilder) WithFilter(filter ExtensionObjectDefinition)
 	return m
 }
 
-func (m *_QueryFirstRequestBuilder) WithFilterBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstRequestBuilder {
-	builder := builderSupplier(m.Filter.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.Filter, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryFirstRequestBuilder) WithMaxDataSetsToReturn(maxDataSetsToReturn uint32) QueryFirstRequestBuilder {
 	m.MaxDataSetsToReturn = maxDataSetsToReturn
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryFirstResponse.go b/plc4go/protocols/opcua/readwrite/model/QueryFirstResponse.go
index b5d8cb99030..da45206d51b 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryFirstResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryFirstResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -118,8 +120,6 @@ type QueryFirstResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfQueryDataSets int32, queryDataSets []ExtensionObjectDefinition, continuationPoint PascalByteString, noOfParsingResults int32, parsingResults []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo, filterResult ExtensionObjectDefinition) QueryFirstResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) QueryFirstResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstResponseBuilder
 	// WithNoOfQueryDataSets adds NoOfQueryDataSets (property field)
 	WithNoOfQueryDataSets(int32) QueryFirstResponseBuilder
 	// WithQueryDataSets adds QueryDataSets (property field)
@@ -138,8 +138,6 @@ type QueryFirstResponseBuilder interface {
 	WithDiagnosticInfos(...DiagnosticInfo) QueryFirstResponseBuilder
 	// WithFilterResult adds FilterResult (property field)
 	WithFilterResult(ExtensionObjectDefinition) QueryFirstResponseBuilder
-	// WithFilterResultBuilder adds FilterResult (property field) which is build by the builder
-	WithFilterResultBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstResponseBuilder
 	// Build builds the QueryFirstResponse or returns an error if something is wrong
 	Build() (QueryFirstResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -168,19 +166,6 @@ func (m *_QueryFirstResponseBuilder) WithResponseHeader(responseHeader Extension
 	return m
 }
 
-func (m *_QueryFirstResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryFirstResponseBuilder) WithNoOfQueryDataSets(noOfQueryDataSets int32) QueryFirstResponseBuilder {
 	m.NoOfQueryDataSets = noOfQueryDataSets
 	return m
@@ -234,19 +219,6 @@ func (m *_QueryFirstResponseBuilder) WithFilterResult(filterResult ExtensionObje
 	return m
 }
 
-func (m *_QueryFirstResponseBuilder) WithFilterResultBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryFirstResponseBuilder {
-	builder := builderSupplier(m.FilterResult.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.FilterResult, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryFirstResponseBuilder) Build() (QueryFirstResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryNextRequest.go b/plc4go/protocols/opcua/readwrite/model/QueryNextRequest.go
index 7885c89b9cb..32331c23fb1 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryNextRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryNextRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -93,8 +95,6 @@ type QueryNextRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, releaseContinuationPoint bool, continuationPoint PascalByteString) QueryNextRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) QueryNextRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryNextRequestBuilder
 	// WithReleaseContinuationPoint adds ReleaseContinuationPoint (property field)
 	WithReleaseContinuationPoint(bool) QueryNextRequestBuilder
 	// WithContinuationPoint adds ContinuationPoint (property field)
@@ -129,19 +129,6 @@ func (m *_QueryNextRequestBuilder) WithRequestHeader(requestHeader ExtensionObje
 	return m
 }
 
-func (m *_QueryNextRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryNextRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryNextRequestBuilder) WithReleaseContinuationPoint(releaseContinuationPoint bool) QueryNextRequestBuilder {
 	m.ReleaseContinuationPoint = releaseContinuationPoint
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/QueryNextResponse.go b/plc4go/protocols/opcua/readwrite/model/QueryNextResponse.go
index 2d8c4771a9f..2d4e8016030 100644
--- a/plc4go/protocols/opcua/readwrite/model/QueryNextResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/QueryNextResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -95,8 +97,6 @@ type QueryNextResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfQueryDataSets int32, queryDataSets []ExtensionObjectDefinition, revisedContinuationPoint PascalByteString) QueryNextResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) QueryNextResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryNextResponseBuilder
 	// WithNoOfQueryDataSets adds NoOfQueryDataSets (property field)
 	WithNoOfQueryDataSets(int32) QueryNextResponseBuilder
 	// WithQueryDataSets adds QueryDataSets (property field)
@@ -133,19 +133,6 @@ func (m *_QueryNextResponseBuilder) WithResponseHeader(responseHeader ExtensionO
 	return m
 }
 
-func (m *_QueryNextResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) QueryNextResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_QueryNextResponseBuilder) WithNoOfQueryDataSets(noOfQueryDataSets int32) QueryNextResponseBuilder {
 	m.NoOfQueryDataSets = noOfQueryDataSets
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/Range.go b/plc4go/protocols/opcua/readwrite/model/Range.go
index 97a5f6eff3a..687b61ba778 100644
--- a/plc4go/protocols/opcua/readwrite/model/Range.go
+++ b/plc4go/protocols/opcua/readwrite/model/Range.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RationalNumber.go b/plc4go/protocols/opcua/readwrite/model/RationalNumber.go
index 01e59999217..74f1374db84 100644
--- a/plc4go/protocols/opcua/readwrite/model/RationalNumber.go
+++ b/plc4go/protocols/opcua/readwrite/model/RationalNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReadRequest.go b/plc4go/protocols/opcua/readwrite/model/ReadRequest.go
index cd9ab76c428..266100c1298 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReadRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReadRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type ReadRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, maxAge float64, timestampsToReturn TimestampsToReturn, noOfNodesToRead int32, nodesToRead []ExtensionObjectDefinition) ReadRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) ReadRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ReadRequestBuilder
 	// WithMaxAge adds MaxAge (property field)
 	WithMaxAge(float64) ReadRequestBuilder
 	// WithTimestampsToReturn adds TimestampsToReturn (property field)
@@ -134,19 +134,6 @@ func (m *_ReadRequestBuilder) WithRequestHeader(requestHeader ExtensionObjectDef
 	return m
 }
 
-func (m *_ReadRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ReadRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ReadRequestBuilder) WithMaxAge(maxAge float64) ReadRequestBuilder {
 	m.MaxAge = maxAge
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ReadResponse.go b/plc4go/protocols/opcua/readwrite/model/ReadResponse.go
index ee84a3fe4a1..1860558d300 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReadResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReadResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type ReadResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []DataValue, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) ReadResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) ReadResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ReadResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) ReadResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_ReadResponseBuilder) WithResponseHeader(responseHeader ExtensionObject
 	return m
 }
 
-func (m *_ReadResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ReadResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ReadResponseBuilder) WithNoOfResults(noOfResults int32) ReadResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ReadValueId.go b/plc4go/protocols/opcua/readwrite/model/ReadValueId.go
index e294fe3d2b3..73ec6b73983 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReadValueId.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReadValueId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReaderGroupMessageDataType.go b/plc4go/protocols/opcua/readwrite/model/ReaderGroupMessageDataType.go
index 9a4c7cccf92..5bfd72525b8 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReaderGroupMessageDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReaderGroupMessageDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReaderGroupTransportDataType.go b/plc4go/protocols/opcua/readwrite/model/ReaderGroupTransportDataType.go
index 5990557c4a8..2f39fd156d7 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReaderGroupTransportDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReaderGroupTransportDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RedundancySupport.go b/plc4go/protocols/opcua/readwrite/model/RedundancySupport.go
index 3056e201cc5..40b5255a0b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/RedundancySupport.go
+++ b/plc4go/protocols/opcua/readwrite/model/RedundancySupport.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RedundantServerDataType.go b/plc4go/protocols/opcua/readwrite/model/RedundantServerDataType.go
index 80b3609621a..d51b931d3b9 100644
--- a/plc4go/protocols/opcua/readwrite/model/RedundantServerDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/RedundantServerDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RedundantServerMode.go b/plc4go/protocols/opcua/readwrite/model/RedundantServerMode.go
index 1a4582c26fb..1ce4e9a2df4 100644
--- a/plc4go/protocols/opcua/readwrite/model/RedundantServerMode.go
+++ b/plc4go/protocols/opcua/readwrite/model/RedundantServerMode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReferenceDescription.go b/plc4go/protocols/opcua/readwrite/model/ReferenceDescription.go
index a44f5c78beb..b5431a4f722 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReferenceDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReferenceDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReferenceDescriptionDataType.go b/plc4go/protocols/opcua/readwrite/model/ReferenceDescriptionDataType.go
index dfe042d12c3..53d95b10f55 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReferenceDescriptionDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReferenceDescriptionDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ReferenceListEntryDataType.go b/plc4go/protocols/opcua/readwrite/model/ReferenceListEntryDataType.go
index 4360ab92fbe..2eb0baf3e72 100644
--- a/plc4go/protocols/opcua/readwrite/model/ReferenceListEntryDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ReferenceListEntryDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterNodesRequest.go b/plc4go/protocols/opcua/readwrite/model/RegisterNodesRequest.go
index 25833f691d5..2b991000c4d 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterNodesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterNodesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type RegisterNodesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfNodesToRegister int32, nodesToRegister []NodeId) RegisterNodesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) RegisterNodesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterNodesRequestBuilder
 	// WithNoOfNodesToRegister adds NoOfNodesToRegister (property field)
 	WithNoOfNodesToRegister(int32) RegisterNodesRequestBuilder
 	// WithNodesToRegister adds NodesToRegister (property field)
@@ -122,19 +122,6 @@ func (m *_RegisterNodesRequestBuilder) WithRequestHeader(requestHeader Extension
 	return m
 }
 
-func (m *_RegisterNodesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterNodesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterNodesRequestBuilder) WithNoOfNodesToRegister(noOfNodesToRegister int32) RegisterNodesRequestBuilder {
 	m.NoOfNodesToRegister = noOfNodesToRegister
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterNodesResponse.go b/plc4go/protocols/opcua/readwrite/model/RegisterNodesResponse.go
index 6c3a3d97844..3b279cb1c3a 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterNodesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterNodesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type RegisterNodesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfRegisteredNodeIds int32, registeredNodeIds []NodeId) RegisterNodesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) RegisterNodesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterNodesResponseBuilder
 	// WithNoOfRegisteredNodeIds adds NoOfRegisteredNodeIds (property field)
 	WithNoOfRegisteredNodeIds(int32) RegisterNodesResponseBuilder
 	// WithRegisteredNodeIds adds RegisteredNodeIds (property field)
@@ -122,19 +122,6 @@ func (m *_RegisterNodesResponseBuilder) WithResponseHeader(responseHeader Extens
 	return m
 }
 
-func (m *_RegisterNodesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterNodesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterNodesResponseBuilder) WithNoOfRegisteredNodeIds(noOfRegisteredNodeIds int32) RegisterNodesResponseBuilder {
 	m.NoOfRegisteredNodeIds = noOfRegisteredNodeIds
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterServer2Request.go b/plc4go/protocols/opcua/readwrite/model/RegisterServer2Request.go
index 4e06f340b0c..ebbdaf157c6 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterServer2Request.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterServer2Request.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -95,12 +97,8 @@ type RegisterServer2RequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, server ExtensionObjectDefinition, noOfDiscoveryConfiguration int32, discoveryConfiguration []ExtensionObject) RegisterServer2RequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) RegisterServer2RequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2RequestBuilder
 	// WithServer adds Server (property field)
 	WithServer(ExtensionObjectDefinition) RegisterServer2RequestBuilder
-	// WithServerBuilder adds Server (property field) which is build by the builder
-	WithServerBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2RequestBuilder
 	// WithNoOfDiscoveryConfiguration adds NoOfDiscoveryConfiguration (property field)
 	WithNoOfDiscoveryConfiguration(int32) RegisterServer2RequestBuilder
 	// WithDiscoveryConfiguration adds DiscoveryConfiguration (property field)
@@ -133,37 +131,11 @@ func (m *_RegisterServer2RequestBuilder) WithRequestHeader(requestHeader Extensi
 	return m
 }
 
-func (m *_RegisterServer2RequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2RequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServer2RequestBuilder) WithServer(server ExtensionObjectDefinition) RegisterServer2RequestBuilder {
 	m.Server = server
 	return m
 }
 
-func (m *_RegisterServer2RequestBuilder) WithServerBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2RequestBuilder {
-	builder := builderSupplier(m.Server.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.Server, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServer2RequestBuilder) WithNoOfDiscoveryConfiguration(noOfDiscoveryConfiguration int32) RegisterServer2RequestBuilder {
 	m.NoOfDiscoveryConfiguration = noOfDiscoveryConfiguration
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterServer2Response.go b/plc4go/protocols/opcua/readwrite/model/RegisterServer2Response.go
index e1a3e5a12f9..b6600355487 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterServer2Response.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterServer2Response.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type RegisterServer2ResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfConfigurationResults int32, configurationResults []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) RegisterServer2ResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) RegisterServer2ResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2ResponseBuilder
 	// WithNoOfConfigurationResults adds NoOfConfigurationResults (property field)
 	WithNoOfConfigurationResults(int32) RegisterServer2ResponseBuilder
 	// WithConfigurationResults adds ConfigurationResults (property field)
@@ -134,19 +134,6 @@ func (m *_RegisterServer2ResponseBuilder) WithResponseHeader(responseHeader Exte
 	return m
 }
 
-func (m *_RegisterServer2ResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServer2ResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServer2ResponseBuilder) WithNoOfConfigurationResults(noOfConfigurationResults int32) RegisterServer2ResponseBuilder {
 	m.NoOfConfigurationResults = noOfConfigurationResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterServerRequest.go b/plc4go/protocols/opcua/readwrite/model/RegisterServerRequest.go
index 42244f10113..7f1f71f0858 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterServerRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterServerRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -87,12 +89,8 @@ type RegisterServerRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, server ExtensionObjectDefinition) RegisterServerRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) RegisterServerRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerRequestBuilder
 	// WithServer adds Server (property field)
 	WithServer(ExtensionObjectDefinition) RegisterServerRequestBuilder
-	// WithServerBuilder adds Server (property field) which is build by the builder
-	WithServerBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerRequestBuilder
 	// Build builds the RegisterServerRequest or returns an error if something is wrong
 	Build() (RegisterServerRequest, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,37 +119,11 @@ func (m *_RegisterServerRequestBuilder) WithRequestHeader(requestHeader Extensio
 	return m
 }
 
-func (m *_RegisterServerRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServerRequestBuilder) WithServer(server ExtensionObjectDefinition) RegisterServerRequestBuilder {
 	m.Server = server
 	return m
 }
 
-func (m *_RegisterServerRequestBuilder) WithServerBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerRequestBuilder {
-	builder := builderSupplier(m.Server.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.Server, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServerRequestBuilder) Build() (RegisterServerRequest, error) {
 	if m.RequestHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisterServerResponse.go b/plc4go/protocols/opcua/readwrite/model/RegisterServerResponse.go
index ae1e06c2fce..e86dc4a2eca 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisterServerResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisterServerResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type RegisterServerResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition) RegisterServerResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) RegisterServerResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerResponseBuilder
 	// Build builds the RegisterServerResponse or returns an error if something is wrong
 	Build() (RegisterServerResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_RegisterServerResponseBuilder) WithResponseHeader(responseHeader Exten
 	return m
 }
 
-func (m *_RegisterServerResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RegisterServerResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RegisterServerResponseBuilder) Build() (RegisterServerResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/RegisteredServer.go b/plc4go/protocols/opcua/readwrite/model/RegisteredServer.go
index ce419a3a653..ea3586414e7 100644
--- a/plc4go/protocols/opcua/readwrite/model/RegisteredServer.go
+++ b/plc4go/protocols/opcua/readwrite/model/RegisteredServer.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RelativePath.go b/plc4go/protocols/opcua/readwrite/model/RelativePath.go
index 6d83b39168f..7fbc494b237 100644
--- a/plc4go/protocols/opcua/readwrite/model/RelativePath.go
+++ b/plc4go/protocols/opcua/readwrite/model/RelativePath.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RelativePathElement.go b/plc4go/protocols/opcua/readwrite/model/RelativePathElement.go
index 07caf049fb8..85acddb4673 100644
--- a/plc4go/protocols/opcua/readwrite/model/RelativePathElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/RelativePathElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RepublishRequest.go b/plc4go/protocols/opcua/readwrite/model/RepublishRequest.go
index 97656cf548e..22dc96b04dc 100644
--- a/plc4go/protocols/opcua/readwrite/model/RepublishRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/RepublishRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type RepublishRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, retransmitSequenceNumber uint32) RepublishRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) RepublishRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) RepublishRequestBuilder
 	// WithRetransmitSequenceNumber adds RetransmitSequenceNumber (property field)
@@ -122,19 +122,6 @@ func (m *_RepublishRequestBuilder) WithRequestHeader(requestHeader ExtensionObje
 	return m
 }
 
-func (m *_RepublishRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RepublishRequestBuilder) WithSubscriptionId(subscriptionId uint32) RepublishRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/RepublishResponse.go b/plc4go/protocols/opcua/readwrite/model/RepublishResponse.go
index d5a0460f51f..815867b0620 100644
--- a/plc4go/protocols/opcua/readwrite/model/RepublishResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/RepublishResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -87,12 +89,8 @@ type RepublishResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, notificationMessage ExtensionObjectDefinition) RepublishResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) RepublishResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishResponseBuilder
 	// WithNotificationMessage adds NotificationMessage (property field)
 	WithNotificationMessage(ExtensionObjectDefinition) RepublishResponseBuilder
-	// WithNotificationMessageBuilder adds NotificationMessage (property field) which is build by the builder
-	WithNotificationMessageBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishResponseBuilder
 	// Build builds the RepublishResponse or returns an error if something is wrong
 	Build() (RepublishResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -121,37 +119,11 @@ func (m *_RepublishResponseBuilder) WithResponseHeader(responseHeader ExtensionO
 	return m
 }
 
-func (m *_RepublishResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RepublishResponseBuilder) WithNotificationMessage(notificationMessage ExtensionObjectDefinition) RepublishResponseBuilder {
 	m.NotificationMessage = notificationMessage
 	return m
 }
 
-func (m *_RepublishResponseBuilder) WithNotificationMessageBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) RepublishResponseBuilder {
-	builder := builderSupplier(m.NotificationMessage.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.NotificationMessage, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_RepublishResponseBuilder) Build() (RepublishResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/RequestHeader.go b/plc4go/protocols/opcua/readwrite/model/RequestHeader.go
index d02e6cc3f10..23fb528df14 100644
--- a/plc4go/protocols/opcua/readwrite/model/RequestHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/RequestHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ResponseHeader.go b/plc4go/protocols/opcua/readwrite/model/ResponseHeader.go
index d66cac7b468..2f6a0e1417e 100644
--- a/plc4go/protocols/opcua/readwrite/model/ResponseHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/ResponseHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RolePermissionType.go b/plc4go/protocols/opcua/readwrite/model/RolePermissionType.go
index f466192c1fa..abe51770d91 100644
--- a/plc4go/protocols/opcua/readwrite/model/RolePermissionType.go
+++ b/plc4go/protocols/opcua/readwrite/model/RolePermissionType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go b/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
index f7c66eec133..663c2a6df9d 100644
--- a/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
+++ b/plc4go/protocols/opcua/readwrite/model/RsaEncryptedSecret.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SamplingIntervalDiagnosticsDataType.go b/plc4go/protocols/opcua/readwrite/model/SamplingIntervalDiagnosticsDataType.go
index 2f7657db435..fe55dd602b0 100644
--- a/plc4go/protocols/opcua/readwrite/model/SamplingIntervalDiagnosticsDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SamplingIntervalDiagnosticsDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SecurityGroupDataType.go b/plc4go/protocols/opcua/readwrite/model/SecurityGroupDataType.go
index 0b11eaa7c55..8eb96239c20 100644
--- a/plc4go/protocols/opcua/readwrite/model/SecurityGroupDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SecurityGroupDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go b/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
index 1ea3a153194..cc8f4a63422 100644
--- a/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/SecurityHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SecurityTokenRequestType.go b/plc4go/protocols/opcua/readwrite/model/SecurityTokenRequestType.go
index d29860ec599..5a5e0923dee 100644
--- a/plc4go/protocols/opcua/readwrite/model/SecurityTokenRequestType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SecurityTokenRequestType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SemanticChangeStructureDataType.go b/plc4go/protocols/opcua/readwrite/model/SemanticChangeStructureDataType.go
index 0997799837d..4bbb47b271b 100644
--- a/plc4go/protocols/opcua/readwrite/model/SemanticChangeStructureDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SemanticChangeStructureDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go b/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
index 206b2391ddc..e22bb4e835e 100644
--- a/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
+++ b/plc4go/protocols/opcua/readwrite/model/SemanticVersionString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go b/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
index 3e0d8f9342f..a123234cbab 100644
--- a/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
+++ b/plc4go/protocols/opcua/readwrite/model/SequenceHeader.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ServerDiagnosticsSummaryDataType.go b/plc4go/protocols/opcua/readwrite/model/ServerDiagnosticsSummaryDataType.go
index 819318ca7f1..fb98857f50e 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServerDiagnosticsSummaryDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServerDiagnosticsSummaryDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ServerOnNetwork.go b/plc4go/protocols/opcua/readwrite/model/ServerOnNetwork.go
index 54fc3ffc14a..09568853796 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServerOnNetwork.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServerOnNetwork.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ServerState.go b/plc4go/protocols/opcua/readwrite/model/ServerState.go
index 11c3241402b..53e8f245f1c 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServerState.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServerState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ServerStatusDataType.go b/plc4go/protocols/opcua/readwrite/model/ServerStatusDataType.go
index 44046a962fd..c97a2ce64c3 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServerStatusDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServerStatusDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -109,8 +111,6 @@ type ServerStatusDataTypeBuilder interface {
 	WithState(ServerState) ServerStatusDataTypeBuilder
 	// WithBuildInfo adds BuildInfo (property field)
 	WithBuildInfo(ExtensionObjectDefinition) ServerStatusDataTypeBuilder
-	// WithBuildInfoBuilder adds BuildInfo (property field) which is build by the builder
-	WithBuildInfoBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ServerStatusDataTypeBuilder
 	// WithSecondsTillShutdown adds SecondsTillShutdown (property field)
 	WithSecondsTillShutdown(uint32) ServerStatusDataTypeBuilder
 	// WithShutdownReason adds ShutdownReason (property field)
@@ -160,19 +160,6 @@ func (m *_ServerStatusDataTypeBuilder) WithBuildInfo(buildInfo ExtensionObjectDe
 	return m
 }
 
-func (m *_ServerStatusDataTypeBuilder) WithBuildInfoBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ServerStatusDataTypeBuilder {
-	builder := builderSupplier(m.BuildInfo.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.BuildInfo, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ServerStatusDataTypeBuilder) WithSecondsTillShutdown(secondsTillShutdown uint32) ServerStatusDataTypeBuilder {
 	m.SecondsTillShutdown = secondsTillShutdown
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/ServiceCounterDataType.go b/plc4go/protocols/opcua/readwrite/model/ServiceCounterDataType.go
index e82253991e4..e79c7bf1aaa 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServiceCounterDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServiceCounterDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ServiceFault.go b/plc4go/protocols/opcua/readwrite/model/ServiceFault.go
index d511981afa4..59411b8c7ad 100644
--- a/plc4go/protocols/opcua/readwrite/model/ServiceFault.go
+++ b/plc4go/protocols/opcua/readwrite/model/ServiceFault.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type ServiceFaultBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition) ServiceFaultBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) ServiceFaultBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ServiceFaultBuilder
 	// Build builds the ServiceFault or returns an error if something is wrong
 	Build() (ServiceFault, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_ServiceFaultBuilder) WithResponseHeader(responseHeader ExtensionObject
 	return m
 }
 
-func (m *_ServiceFaultBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) ServiceFaultBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_ServiceFaultBuilder) Build() (ServiceFault, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go b/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
index 5232a2efaa0..1cdbc1a69c3 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionAuthenticationToken.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionDiagnosticsDataType.go b/plc4go/protocols/opcua/readwrite/model/SessionDiagnosticsDataType.go
index 6e1590734f6..97044b841da 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionDiagnosticsDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionDiagnosticsDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -359,8 +361,6 @@ type SessionDiagnosticsDataTypeBuilder interface {
 	WithSessionNameBuilder(func(PascalStringBuilder) PascalStringBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithClientDescription adds ClientDescription (property field)
 	WithClientDescription(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithClientDescriptionBuilder adds ClientDescription (property field) which is build by the builder
-	WithClientDescriptionBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithServerUri adds ServerUri (property field)
 	WithServerUri(PascalString) SessionDiagnosticsDataTypeBuilder
 	// WithServerUriBuilder adds ServerUri (property field) which is build by the builder
@@ -389,122 +389,64 @@ type SessionDiagnosticsDataTypeBuilder interface {
 	WithCurrentPublishRequestsInQueue(uint32) SessionDiagnosticsDataTypeBuilder
 	// WithTotalRequestCount adds TotalRequestCount (property field)
 	WithTotalRequestCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithTotalRequestCountBuilder adds TotalRequestCount (property field) which is build by the builder
-	WithTotalRequestCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithUnauthorizedRequestCount adds UnauthorizedRequestCount (property field)
 	WithUnauthorizedRequestCount(uint32) SessionDiagnosticsDataTypeBuilder
 	// WithReadCount adds ReadCount (property field)
 	WithReadCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithReadCountBuilder adds ReadCount (property field) which is build by the builder
-	WithReadCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithHistoryReadCount adds HistoryReadCount (property field)
 	WithHistoryReadCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithHistoryReadCountBuilder adds HistoryReadCount (property field) which is build by the builder
-	WithHistoryReadCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithWriteCount adds WriteCount (property field)
 	WithWriteCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithWriteCountBuilder adds WriteCount (property field) which is build by the builder
-	WithWriteCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithHistoryUpdateCount adds HistoryUpdateCount (property field)
 	WithHistoryUpdateCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithHistoryUpdateCountBuilder adds HistoryUpdateCount (property field) which is build by the builder
-	WithHistoryUpdateCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithCallCount adds CallCount (property field)
 	WithCallCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithCallCountBuilder adds CallCount (property field) which is build by the builder
-	WithCallCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithCreateMonitoredItemsCount adds CreateMonitoredItemsCount (property field)
 	WithCreateMonitoredItemsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithCreateMonitoredItemsCountBuilder adds CreateMonitoredItemsCount (property field) which is build by the builder
-	WithCreateMonitoredItemsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithModifyMonitoredItemsCount adds ModifyMonitoredItemsCount (property field)
 	WithModifyMonitoredItemsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithModifyMonitoredItemsCountBuilder adds ModifyMonitoredItemsCount (property field) which is build by the builder
-	WithModifyMonitoredItemsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithSetMonitoringModeCount adds SetMonitoringModeCount (property field)
 	WithSetMonitoringModeCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithSetMonitoringModeCountBuilder adds SetMonitoringModeCount (property field) which is build by the builder
-	WithSetMonitoringModeCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithSetTriggeringCount adds SetTriggeringCount (property field)
 	WithSetTriggeringCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithSetTriggeringCountBuilder adds SetTriggeringCount (property field) which is build by the builder
-	WithSetTriggeringCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithDeleteMonitoredItemsCount adds DeleteMonitoredItemsCount (property field)
 	WithDeleteMonitoredItemsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithDeleteMonitoredItemsCountBuilder adds DeleteMonitoredItemsCount (property field) which is build by the builder
-	WithDeleteMonitoredItemsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithCreateSubscriptionCount adds CreateSubscriptionCount (property field)
 	WithCreateSubscriptionCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithCreateSubscriptionCountBuilder adds CreateSubscriptionCount (property field) which is build by the builder
-	WithCreateSubscriptionCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithModifySubscriptionCount adds ModifySubscriptionCount (property field)
 	WithModifySubscriptionCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithModifySubscriptionCountBuilder adds ModifySubscriptionCount (property field) which is build by the builder
-	WithModifySubscriptionCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithSetPublishingModeCount adds SetPublishingModeCount (property field)
 	WithSetPublishingModeCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithSetPublishingModeCountBuilder adds SetPublishingModeCount (property field) which is build by the builder
-	WithSetPublishingModeCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithPublishCount adds PublishCount (property field)
 	WithPublishCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithPublishCountBuilder adds PublishCount (property field) which is build by the builder
-	WithPublishCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithRepublishCount adds RepublishCount (property field)
 	WithRepublishCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithRepublishCountBuilder adds RepublishCount (property field) which is build by the builder
-	WithRepublishCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithTransferSubscriptionsCount adds TransferSubscriptionsCount (property field)
 	WithTransferSubscriptionsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithTransferSubscriptionsCountBuilder adds TransferSubscriptionsCount (property field) which is build by the builder
-	WithTransferSubscriptionsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithDeleteSubscriptionsCount adds DeleteSubscriptionsCount (property field)
 	WithDeleteSubscriptionsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithDeleteSubscriptionsCountBuilder adds DeleteSubscriptionsCount (property field) which is build by the builder
-	WithDeleteSubscriptionsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithAddNodesCount adds AddNodesCount (property field)
 	WithAddNodesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithAddNodesCountBuilder adds AddNodesCount (property field) which is build by the builder
-	WithAddNodesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithAddReferencesCount adds AddReferencesCount (property field)
 	WithAddReferencesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithAddReferencesCountBuilder adds AddReferencesCount (property field) which is build by the builder
-	WithAddReferencesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithDeleteNodesCount adds DeleteNodesCount (property field)
 	WithDeleteNodesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithDeleteNodesCountBuilder adds DeleteNodesCount (property field) which is build by the builder
-	WithDeleteNodesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithDeleteReferencesCount adds DeleteReferencesCount (property field)
 	WithDeleteReferencesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithDeleteReferencesCountBuilder adds DeleteReferencesCount (property field) which is build by the builder
-	WithDeleteReferencesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithBrowseCount adds BrowseCount (property field)
 	WithBrowseCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithBrowseCountBuilder adds BrowseCount (property field) which is build by the builder
-	WithBrowseCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithBrowseNextCount adds BrowseNextCount (property field)
 	WithBrowseNextCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithBrowseNextCountBuilder adds BrowseNextCount (property field) which is build by the builder
-	WithBrowseNextCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithTranslateBrowsePathsToNodeIdsCount adds TranslateBrowsePathsToNodeIdsCount (property field)
 	WithTranslateBrowsePathsToNodeIdsCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithTranslateBrowsePathsToNodeIdsCountBuilder adds TranslateBrowsePathsToNodeIdsCount (property field) which is build by the builder
-	WithTranslateBrowsePathsToNodeIdsCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithQueryFirstCount adds QueryFirstCount (property field)
 	WithQueryFirstCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithQueryFirstCountBuilder adds QueryFirstCount (property field) which is build by the builder
-	WithQueryFirstCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithQueryNextCount adds QueryNextCount (property field)
 	WithQueryNextCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithQueryNextCountBuilder adds QueryNextCount (property field) which is build by the builder
-	WithQueryNextCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithRegisterNodesCount adds RegisterNodesCount (property field)
 	WithRegisterNodesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithRegisterNodesCountBuilder adds RegisterNodesCount (property field) which is build by the builder
-	WithRegisterNodesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// WithUnregisterNodesCount adds UnregisterNodesCount (property field)
 	WithUnregisterNodesCount(ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder
-	// WithUnregisterNodesCountBuilder adds UnregisterNodesCount (property field) which is build by the builder
-	WithUnregisterNodesCountBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder
 	// Build builds the SessionDiagnosticsDataType or returns an error if something is wrong
 	Build() (SessionDiagnosticsDataType, error)
 	// MustBuild does the same as Build but panics on error
@@ -569,19 +511,6 @@ func (m *_SessionDiagnosticsDataTypeBuilder) WithClientDescription(clientDescrip
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithClientDescriptionBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.ClientDescription.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ClientDescription, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithServerUri(serverUri PascalString) SessionDiagnosticsDataTypeBuilder {
 	m.ServerUri = serverUri
 	return m
@@ -668,19 +597,6 @@ func (m *_SessionDiagnosticsDataTypeBuilder) WithTotalRequestCount(totalRequestC
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithTotalRequestCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.TotalRequestCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.TotalRequestCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithUnauthorizedRequestCount(unauthorizedRequestCount uint32) SessionDiagnosticsDataTypeBuilder {
 	m.UnauthorizedRequestCount = unauthorizedRequestCount
 	return m
@@ -691,505 +607,141 @@ func (m *_SessionDiagnosticsDataTypeBuilder) WithReadCount(readCount ExtensionOb
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithReadCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.ReadCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ReadCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithHistoryReadCount(historyReadCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.HistoryReadCount = historyReadCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithHistoryReadCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.HistoryReadCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.HistoryReadCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithWriteCount(writeCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.WriteCount = writeCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithWriteCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.WriteCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.WriteCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithHistoryUpdateCount(historyUpdateCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.HistoryUpdateCount = historyUpdateCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithHistoryUpdateCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.HistoryUpdateCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.HistoryUpdateCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithCallCount(callCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.CallCount = callCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithCallCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.CallCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.CallCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithCreateMonitoredItemsCount(createMonitoredItemsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.CreateMonitoredItemsCount = createMonitoredItemsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithCreateMonitoredItemsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.CreateMonitoredItemsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.CreateMonitoredItemsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithModifyMonitoredItemsCount(modifyMonitoredItemsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.ModifyMonitoredItemsCount = modifyMonitoredItemsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithModifyMonitoredItemsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.ModifyMonitoredItemsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ModifyMonitoredItemsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithSetMonitoringModeCount(setMonitoringModeCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.SetMonitoringModeCount = setMonitoringModeCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithSetMonitoringModeCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.SetMonitoringModeCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.SetMonitoringModeCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithSetTriggeringCount(setTriggeringCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.SetTriggeringCount = setTriggeringCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithSetTriggeringCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.SetTriggeringCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.SetTriggeringCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteMonitoredItemsCount(deleteMonitoredItemsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.DeleteMonitoredItemsCount = deleteMonitoredItemsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteMonitoredItemsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.DeleteMonitoredItemsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.DeleteMonitoredItemsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithCreateSubscriptionCount(createSubscriptionCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.CreateSubscriptionCount = createSubscriptionCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithCreateSubscriptionCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.CreateSubscriptionCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.CreateSubscriptionCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithModifySubscriptionCount(modifySubscriptionCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.ModifySubscriptionCount = modifySubscriptionCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithModifySubscriptionCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.ModifySubscriptionCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ModifySubscriptionCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithSetPublishingModeCount(setPublishingModeCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.SetPublishingModeCount = setPublishingModeCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithSetPublishingModeCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.SetPublishingModeCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.SetPublishingModeCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithPublishCount(publishCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.PublishCount = publishCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithPublishCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.PublishCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.PublishCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithRepublishCount(republishCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.RepublishCount = republishCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithRepublishCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.RepublishCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RepublishCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithTransferSubscriptionsCount(transferSubscriptionsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.TransferSubscriptionsCount = transferSubscriptionsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithTransferSubscriptionsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.TransferSubscriptionsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.TransferSubscriptionsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteSubscriptionsCount(deleteSubscriptionsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.DeleteSubscriptionsCount = deleteSubscriptionsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteSubscriptionsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.DeleteSubscriptionsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.DeleteSubscriptionsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithAddNodesCount(addNodesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.AddNodesCount = addNodesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithAddNodesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.AddNodesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.AddNodesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithAddReferencesCount(addReferencesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.AddReferencesCount = addReferencesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithAddReferencesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.AddReferencesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.AddReferencesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteNodesCount(deleteNodesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.DeleteNodesCount = deleteNodesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteNodesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.DeleteNodesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.DeleteNodesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteReferencesCount(deleteReferencesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.DeleteReferencesCount = deleteReferencesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithDeleteReferencesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.DeleteReferencesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.DeleteReferencesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithBrowseCount(browseCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.BrowseCount = browseCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithBrowseCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.BrowseCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.BrowseCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithBrowseNextCount(browseNextCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.BrowseNextCount = browseNextCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithBrowseNextCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.BrowseNextCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.BrowseNextCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithTranslateBrowsePathsToNodeIdsCount(translateBrowsePathsToNodeIdsCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.TranslateBrowsePathsToNodeIdsCount = translateBrowsePathsToNodeIdsCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithTranslateBrowsePathsToNodeIdsCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.TranslateBrowsePathsToNodeIdsCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.TranslateBrowsePathsToNodeIdsCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithQueryFirstCount(queryFirstCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.QueryFirstCount = queryFirstCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithQueryFirstCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.QueryFirstCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.QueryFirstCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithQueryNextCount(queryNextCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.QueryNextCount = queryNextCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithQueryNextCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.QueryNextCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.QueryNextCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithRegisterNodesCount(registerNodesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.RegisterNodesCount = registerNodesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithRegisterNodesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.RegisterNodesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RegisterNodesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) WithUnregisterNodesCount(unregisterNodesCount ExtensionObjectDefinition) SessionDiagnosticsDataTypeBuilder {
 	m.UnregisterNodesCount = unregisterNodesCount
 	return m
 }
 
-func (m *_SessionDiagnosticsDataTypeBuilder) WithUnregisterNodesCountBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SessionDiagnosticsDataTypeBuilder {
-	builder := builderSupplier(m.UnregisterNodesCount.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.UnregisterNodesCount, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SessionDiagnosticsDataTypeBuilder) Build() (SessionDiagnosticsDataType, error) {
 	if m.SessionId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionSecurityDiagnosticsDataType.go b/plc4go/protocols/opcua/readwrite/model/SessionSecurityDiagnosticsDataType.go
index 5afcdea72ac..4e5784c4877 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionSecurityDiagnosticsDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionSecurityDiagnosticsDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeRequestType.go b/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeRequestType.go
index 56777e1714d..235ca8dc2ec 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeRequestType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeRequestType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeResponseType.go b/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeResponseType.go
index a09e518d358..1bb9cdee9c1 100644
--- a/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeResponseType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SessionlessInvokeResponseType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeRequest.go b/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeRequest.go
index ba6fd534e4a..c4754ac1046 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type SetMonitoringModeRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, monitoringMode MonitoringMode, noOfMonitoredItemIds int32, monitoredItemIds []uint32) SetMonitoringModeRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) SetMonitoringModeRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetMonitoringModeRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) SetMonitoringModeRequestBuilder
 	// WithMonitoringMode adds MonitoringMode (property field)
@@ -134,19 +134,6 @@ func (m *_SetMonitoringModeRequestBuilder) WithRequestHeader(requestHeader Exten
 	return m
 }
 
-func (m *_SetMonitoringModeRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetMonitoringModeRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetMonitoringModeRequestBuilder) WithSubscriptionId(subscriptionId uint32) SetMonitoringModeRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeResponse.go b/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeResponse.go
index a9259a245be..bfb274ed8ae 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetMonitoringModeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type SetMonitoringModeResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) SetMonitoringModeResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) SetMonitoringModeResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetMonitoringModeResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) SetMonitoringModeResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_SetMonitoringModeResponseBuilder) WithResponseHeader(responseHeader Ex
 	return m
 }
 
-func (m *_SetMonitoringModeResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetMonitoringModeResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetMonitoringModeResponseBuilder) WithNoOfResults(noOfResults int32) SetMonitoringModeResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SetPublishingModeRequest.go b/plc4go/protocols/opcua/readwrite/model/SetPublishingModeRequest.go
index 5cd9b4feaa7..a9ee7dc5ba9 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetPublishingModeRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetPublishingModeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type SetPublishingModeRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, publishingEnabled bool, noOfSubscriptionIds int32, subscriptionIds []uint32) SetPublishingModeRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) SetPublishingModeRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetPublishingModeRequestBuilder
 	// WithPublishingEnabled adds PublishingEnabled (property field)
 	WithPublishingEnabled(bool) SetPublishingModeRequestBuilder
 	// WithNoOfSubscriptionIds adds NoOfSubscriptionIds (property field)
@@ -130,19 +130,6 @@ func (m *_SetPublishingModeRequestBuilder) WithRequestHeader(requestHeader Exten
 	return m
 }
 
-func (m *_SetPublishingModeRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetPublishingModeRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetPublishingModeRequestBuilder) WithPublishingEnabled(publishingEnabled bool) SetPublishingModeRequestBuilder {
 	m.PublishingEnabled = publishingEnabled
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SetPublishingModeResponse.go b/plc4go/protocols/opcua/readwrite/model/SetPublishingModeResponse.go
index c394a3cef48..010d1cf6e6d 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetPublishingModeResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetPublishingModeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type SetPublishingModeResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) SetPublishingModeResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) SetPublishingModeResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetPublishingModeResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) SetPublishingModeResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_SetPublishingModeResponseBuilder) WithResponseHeader(responseHeader Ex
 	return m
 }
 
-func (m *_SetPublishingModeResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetPublishingModeResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetPublishingModeResponseBuilder) WithNoOfResults(noOfResults int32) SetPublishingModeResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SetTriggeringRequest.go b/plc4go/protocols/opcua/readwrite/model/SetTriggeringRequest.go
index 7d83ae9305c..0763181ad3f 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetTriggeringRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetTriggeringRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -104,8 +106,6 @@ type SetTriggeringRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, subscriptionId uint32, triggeringItemId uint32, noOfLinksToAdd int32, linksToAdd []uint32, noOfLinksToRemove int32, linksToRemove []uint32) SetTriggeringRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) SetTriggeringRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetTriggeringRequestBuilder
 	// WithSubscriptionId adds SubscriptionId (property field)
 	WithSubscriptionId(uint32) SetTriggeringRequestBuilder
 	// WithTriggeringItemId adds TriggeringItemId (property field)
@@ -146,19 +146,6 @@ func (m *_SetTriggeringRequestBuilder) WithRequestHeader(requestHeader Extension
 	return m
 }
 
-func (m *_SetTriggeringRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetTriggeringRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetTriggeringRequestBuilder) WithSubscriptionId(subscriptionId uint32) SetTriggeringRequestBuilder {
 	m.SubscriptionId = subscriptionId
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SetTriggeringResponse.go b/plc4go/protocols/opcua/readwrite/model/SetTriggeringResponse.go
index d41969ed982..f3f8de78beb 100644
--- a/plc4go/protocols/opcua/readwrite/model/SetTriggeringResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/SetTriggeringResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -112,8 +114,6 @@ type SetTriggeringResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfAddResults int32, addResults []StatusCode, noOfAddDiagnosticInfos int32, addDiagnosticInfos []DiagnosticInfo, noOfRemoveResults int32, removeResults []StatusCode, noOfRemoveDiagnosticInfos int32, removeDiagnosticInfos []DiagnosticInfo) SetTriggeringResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) SetTriggeringResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetTriggeringResponseBuilder
 	// WithNoOfAddResults adds NoOfAddResults (property field)
 	WithNoOfAddResults(int32) SetTriggeringResponseBuilder
 	// WithAddResults adds AddResults (property field)
@@ -158,19 +158,6 @@ func (m *_SetTriggeringResponseBuilder) WithResponseHeader(responseHeader Extens
 	return m
 }
 
-func (m *_SetTriggeringResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) SetTriggeringResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_SetTriggeringResponseBuilder) WithNoOfAddResults(noOfAddResults int32) SetTriggeringResponseBuilder {
 	m.NoOfAddResults = noOfAddResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/SignatureData.go b/plc4go/protocols/opcua/readwrite/model/SignatureData.go
index dccb04b2e97..418fa3ff384 100644
--- a/plc4go/protocols/opcua/readwrite/model/SignatureData.go
+++ b/plc4go/protocols/opcua/readwrite/model/SignatureData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SignedSoftwareCertificate.go b/plc4go/protocols/opcua/readwrite/model/SignedSoftwareCertificate.go
index 76825d8c6a5..537765983ab 100644
--- a/plc4go/protocols/opcua/readwrite/model/SignedSoftwareCertificate.go
+++ b/plc4go/protocols/opcua/readwrite/model/SignedSoftwareCertificate.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StatusChangeNotification.go b/plc4go/protocols/opcua/readwrite/model/StatusChangeNotification.go
index 22fa01d263c..c1582d07b00 100644
--- a/plc4go/protocols/opcua/readwrite/model/StatusChangeNotification.go
+++ b/plc4go/protocols/opcua/readwrite/model/StatusChangeNotification.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StatusCode.go b/plc4go/protocols/opcua/readwrite/model/StatusCode.go
index b3bce8df48e..6af47735243 100644
--- a/plc4go/protocols/opcua/readwrite/model/StatusCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/StatusCode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StatusResult.go b/plc4go/protocols/opcua/readwrite/model/StatusResult.go
index 6351c65025c..1aa5497d0a7 100644
--- a/plc4go/protocols/opcua/readwrite/model/StatusResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/StatusResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StringNodeId.go b/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
index aa89c38fb69..2acb0555586 100644
--- a/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/StringNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Structure.go b/plc4go/protocols/opcua/readwrite/model/Structure.go
index 7ee02ac6504..f2d17fb6542 100644
--- a/plc4go/protocols/opcua/readwrite/model/Structure.go
+++ b/plc4go/protocols/opcua/readwrite/model/Structure.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StructureField.go b/plc4go/protocols/opcua/readwrite/model/StructureField.go
index 70353f0452e..3524b8f0f67 100644
--- a/plc4go/protocols/opcua/readwrite/model/StructureField.go
+++ b/plc4go/protocols/opcua/readwrite/model/StructureField.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/StructureType.go b/plc4go/protocols/opcua/readwrite/model/StructureType.go
index d53bf487af7..56e172af790 100644
--- a/plc4go/protocols/opcua/readwrite/model/StructureType.go
+++ b/plc4go/protocols/opcua/readwrite/model/StructureType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SubscribedDataSetDataType.go b/plc4go/protocols/opcua/readwrite/model/SubscribedDataSetDataType.go
index 889c760b6c1..af32c6c2e63 100644
--- a/plc4go/protocols/opcua/readwrite/model/SubscribedDataSetDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SubscribedDataSetDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SubscriptionAcknowledgement.go b/plc4go/protocols/opcua/readwrite/model/SubscriptionAcknowledgement.go
index 29052755cf0..e1f13aa5b25 100644
--- a/plc4go/protocols/opcua/readwrite/model/SubscriptionAcknowledgement.go
+++ b/plc4go/protocols/opcua/readwrite/model/SubscriptionAcknowledgement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/SubscriptionDiagnosticsDataType.go b/plc4go/protocols/opcua/readwrite/model/SubscriptionDiagnosticsDataType.go
index e0a10f5cea1..818146c23c8 100644
--- a/plc4go/protocols/opcua/readwrite/model/SubscriptionDiagnosticsDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/SubscriptionDiagnosticsDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TimeString.go b/plc4go/protocols/opcua/readwrite/model/TimeString.go
index 273055263a7..50ca6ee8caf 100644
--- a/plc4go/protocols/opcua/readwrite/model/TimeString.go
+++ b/plc4go/protocols/opcua/readwrite/model/TimeString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TimeZoneDataType.go b/plc4go/protocols/opcua/readwrite/model/TimeZoneDataType.go
index f5e55c49319..2901a921a75 100644
--- a/plc4go/protocols/opcua/readwrite/model/TimeZoneDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/TimeZoneDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TimestampsToReturn.go b/plc4go/protocols/opcua/readwrite/model/TimestampsToReturn.go
index e1a2d6aecab..cb73a22ed3a 100644
--- a/plc4go/protocols/opcua/readwrite/model/TimestampsToReturn.go
+++ b/plc4go/protocols/opcua/readwrite/model/TimestampsToReturn.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TransactionErrorType.go b/plc4go/protocols/opcua/readwrite/model/TransactionErrorType.go
index dfde6ce44ad..6b827ade339 100644
--- a/plc4go/protocols/opcua/readwrite/model/TransactionErrorType.go
+++ b/plc4go/protocols/opcua/readwrite/model/TransactionErrorType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TransferResult.go b/plc4go/protocols/opcua/readwrite/model/TransferResult.go
index 753e07fa795..7b638ff4c9e 100644
--- a/plc4go/protocols/opcua/readwrite/model/TransferResult.go
+++ b/plc4go/protocols/opcua/readwrite/model/TransferResult.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsRequest.go b/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsRequest.go
index e2e59c1b777..15562afb14a 100644
--- a/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -94,8 +96,6 @@ type TransferSubscriptionsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfSubscriptionIds int32, subscriptionIds []uint32, sendInitialValues bool) TransferSubscriptionsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) TransferSubscriptionsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TransferSubscriptionsRequestBuilder
 	// WithNoOfSubscriptionIds adds NoOfSubscriptionIds (property field)
 	WithNoOfSubscriptionIds(int32) TransferSubscriptionsRequestBuilder
 	// WithSubscriptionIds adds SubscriptionIds (property field)
@@ -130,19 +130,6 @@ func (m *_TransferSubscriptionsRequestBuilder) WithRequestHeader(requestHeader E
 	return m
 }
 
-func (m *_TransferSubscriptionsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TransferSubscriptionsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TransferSubscriptionsRequestBuilder) WithNoOfSubscriptionIds(noOfSubscriptionIds int32) TransferSubscriptionsRequestBuilder {
 	m.NoOfSubscriptionIds = noOfSubscriptionIds
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsResponse.go b/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsResponse.go
index 5c4698df3cc..dcff294f54b 100644
--- a/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/TransferSubscriptionsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type TransferSubscriptionsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) TransferSubscriptionsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) TransferSubscriptionsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TransferSubscriptionsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) TransferSubscriptionsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_TransferSubscriptionsResponseBuilder) WithResponseHeader(responseHeade
 	return m
 }
 
-func (m *_TransferSubscriptionsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TransferSubscriptionsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TransferSubscriptionsResponseBuilder) WithNoOfResults(noOfResults int32) TransferSubscriptionsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsRequest.go b/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsRequest.go
index 12405193553..0d739f8bc29 100644
--- a/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type TranslateBrowsePathsToNodeIdsRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfBrowsePaths int32, browsePaths []ExtensionObjectDefinition) TranslateBrowsePathsToNodeIdsRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) TranslateBrowsePathsToNodeIdsRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TranslateBrowsePathsToNodeIdsRequestBuilder
 	// WithNoOfBrowsePaths adds NoOfBrowsePaths (property field)
 	WithNoOfBrowsePaths(int32) TranslateBrowsePathsToNodeIdsRequestBuilder
 	// WithBrowsePaths adds BrowsePaths (property field)
@@ -122,19 +122,6 @@ func (m *_TranslateBrowsePathsToNodeIdsRequestBuilder) WithRequestHeader(request
 	return m
 }
 
-func (m *_TranslateBrowsePathsToNodeIdsRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TranslateBrowsePathsToNodeIdsRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TranslateBrowsePathsToNodeIdsRequestBuilder) WithNoOfBrowsePaths(noOfBrowsePaths int32) TranslateBrowsePathsToNodeIdsRequestBuilder {
 	m.NoOfBrowsePaths = noOfBrowsePaths
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsResponse.go b/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsResponse.go
index 4ed3d691686..c6e18024c50 100644
--- a/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/TranslateBrowsePathsToNodeIdsResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type TranslateBrowsePathsToNodeIdsResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []ExtensionObjectDefinition, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) TranslateBrowsePathsToNodeIdsResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) TranslateBrowsePathsToNodeIdsResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TranslateBrowsePathsToNodeIdsResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) TranslateBrowsePathsToNodeIdsResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_TranslateBrowsePathsToNodeIdsResponseBuilder) WithResponseHeader(respo
 	return m
 }
 
-func (m *_TranslateBrowsePathsToNodeIdsResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) TranslateBrowsePathsToNodeIdsResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TranslateBrowsePathsToNodeIdsResponseBuilder) WithNoOfResults(noOfResults int32) TranslateBrowsePathsToNodeIdsResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/TrimmedString.go b/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
index 3cf44375ff5..02b746aa702 100644
--- a/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
+++ b/plc4go/protocols/opcua/readwrite/model/TrimmedString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TrustListDataType.go b/plc4go/protocols/opcua/readwrite/model/TrustListDataType.go
index 19127d132ea..21021d7a5af 100644
--- a/plc4go/protocols/opcua/readwrite/model/TrustListDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/TrustListDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TrustListMasks.go b/plc4go/protocols/opcua/readwrite/model/TrustListMasks.go
index c2037637bbc..cff752e73a6 100644
--- a/plc4go/protocols/opcua/readwrite/model/TrustListMasks.go
+++ b/plc4go/protocols/opcua/readwrite/model/TrustListMasks.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TrustListValidationOptions.go b/plc4go/protocols/opcua/readwrite/model/TrustListValidationOptions.go
index c559f629882..3f9fbe860be 100644
--- a/plc4go/protocols/opcua/readwrite/model/TrustListValidationOptions.go
+++ b/plc4go/protocols/opcua/readwrite/model/TrustListValidationOptions.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TsnFailureCode.go b/plc4go/protocols/opcua/readwrite/model/TsnFailureCode.go
index d066f71151b..4ceb7be5537 100644
--- a/plc4go/protocols/opcua/readwrite/model/TsnFailureCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/TsnFailureCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TsnListenerStatus.go b/plc4go/protocols/opcua/readwrite/model/TsnListenerStatus.go
index c410d9ad9fb..a08cb3623da 100644
--- a/plc4go/protocols/opcua/readwrite/model/TsnListenerStatus.go
+++ b/plc4go/protocols/opcua/readwrite/model/TsnListenerStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TsnStreamState.go b/plc4go/protocols/opcua/readwrite/model/TsnStreamState.go
index ecf93678dea..b113545384c 100644
--- a/plc4go/protocols/opcua/readwrite/model/TsnStreamState.go
+++ b/plc4go/protocols/opcua/readwrite/model/TsnStreamState.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TsnTalkerStatus.go b/plc4go/protocols/opcua/readwrite/model/TsnTalkerStatus.go
index 8f698eb1ffa..0f194b98e45 100644
--- a/plc4go/protocols/opcua/readwrite/model/TsnTalkerStatus.go
+++ b/plc4go/protocols/opcua/readwrite/model/TsnTalkerStatus.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go b/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
index bd9d40a0308..1461e69191d 100644
--- a/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/TwoByteNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UadpDataSetMessageContentMask.go b/plc4go/protocols/opcua/readwrite/model/UadpDataSetMessageContentMask.go
index 4888e66685b..2aef295bc2a 100644
--- a/plc4go/protocols/opcua/readwrite/model/UadpDataSetMessageContentMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/UadpDataSetMessageContentMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UadpNetworkMessageContentMask.go b/plc4go/protocols/opcua/readwrite/model/UadpNetworkMessageContentMask.go
index 0a68e2eb240..8f015d245c1 100644
--- a/plc4go/protocols/opcua/readwrite/model/UadpNetworkMessageContentMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/UadpNetworkMessageContentMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Union.go b/plc4go/protocols/opcua/readwrite/model/Union.go
index f819f5ef523..dd6e02b348b 100644
--- a/plc4go/protocols/opcua/readwrite/model/Union.go
+++ b/plc4go/protocols/opcua/readwrite/model/Union.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UnregisterNodesRequest.go b/plc4go/protocols/opcua/readwrite/model/UnregisterNodesRequest.go
index d10e7d0c36d..fe9c1a3c815 100644
--- a/plc4go/protocols/opcua/readwrite/model/UnregisterNodesRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/UnregisterNodesRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type UnregisterNodesRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfNodesToUnregister int32, nodesToUnregister []NodeId) UnregisterNodesRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) UnregisterNodesRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) UnregisterNodesRequestBuilder
 	// WithNoOfNodesToUnregister adds NoOfNodesToUnregister (property field)
 	WithNoOfNodesToUnregister(int32) UnregisterNodesRequestBuilder
 	// WithNodesToUnregister adds NodesToUnregister (property field)
@@ -122,19 +122,6 @@ func (m *_UnregisterNodesRequestBuilder) WithRequestHeader(requestHeader Extensi
 	return m
 }
 
-func (m *_UnregisterNodesRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) UnregisterNodesRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_UnregisterNodesRequestBuilder) WithNoOfNodesToUnregister(noOfNodesToUnregister int32) UnregisterNodesRequestBuilder {
 	m.NoOfNodesToUnregister = noOfNodesToUnregister
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/UnregisterNodesResponse.go b/plc4go/protocols/opcua/readwrite/model/UnregisterNodesResponse.go
index f5757219ffa..eb68d3e173d 100644
--- a/plc4go/protocols/opcua/readwrite/model/UnregisterNodesResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/UnregisterNodesResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type UnregisterNodesResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition) UnregisterNodesResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) UnregisterNodesResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) UnregisterNodesResponseBuilder
 	// Build builds the UnregisterNodesResponse or returns an error if something is wrong
 	Build() (UnregisterNodesResponse, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_UnregisterNodesResponseBuilder) WithResponseHeader(responseHeader Exte
 	return m
 }
 
-func (m *_UnregisterNodesResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) UnregisterNodesResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_UnregisterNodesResponseBuilder) Build() (UnregisterNodesResponse, error) {
 	if m.ResponseHeader == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/UnsignedRationalNumber.go b/plc4go/protocols/opcua/readwrite/model/UnsignedRationalNumber.go
index 68509d98438..b68a0484048 100644
--- a/plc4go/protocols/opcua/readwrite/model/UnsignedRationalNumber.go
+++ b/plc4go/protocols/opcua/readwrite/model/UnsignedRationalNumber.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UriString.go b/plc4go/protocols/opcua/readwrite/model/UriString.go
index 3cb164fc20d..067e90bc5cd 100644
--- a/plc4go/protocols/opcua/readwrite/model/UriString.go
+++ b/plc4go/protocols/opcua/readwrite/model/UriString.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserConfigurationMask.go b/plc4go/protocols/opcua/readwrite/model/UserConfigurationMask.go
index 41a33226494..061ae569244 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserConfigurationMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserConfigurationMask.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserIdentityToken.go b/plc4go/protocols/opcua/readwrite/model/UserIdentityToken.go
index 500eea6ea23..37eae650ae9 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserIdentityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserIdentityToken.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -91,8 +93,6 @@ type UserIdentityTokenBuilder interface {
 	WithPolicyIdBuilder(func(PascalStringBuilder) PascalStringBuilder) UserIdentityTokenBuilder
 	// WithUserIdentityTokenDefinition adds UserIdentityTokenDefinition (property field)
 	WithUserIdentityTokenDefinition(UserIdentityTokenDefinition) UserIdentityTokenBuilder
-	// WithUserIdentityTokenDefinitionBuilder adds UserIdentityTokenDefinition (property field) which is build by the builder
-	WithUserIdentityTokenDefinitionBuilder(func(UserIdentityTokenDefinitionBuilder) UserIdentityTokenDefinitionBuilder) UserIdentityTokenBuilder
 	// Build builds the UserIdentityToken or returns an error if something is wrong
 	Build() (UserIdentityToken, error)
 	// MustBuild does the same as Build but panics on error
@@ -139,19 +139,6 @@ func (m *_UserIdentityTokenBuilder) WithUserIdentityTokenDefinition(userIdentity
 	return m
 }
 
-func (m *_UserIdentityTokenBuilder) WithUserIdentityTokenDefinitionBuilder(builderSupplier func(UserIdentityTokenDefinitionBuilder) UserIdentityTokenDefinitionBuilder) UserIdentityTokenBuilder {
-	builder := builderSupplier(m.UserIdentityTokenDefinition.CreateUserIdentityTokenDefinitionBuilder())
-	var err error
-	m.UserIdentityTokenDefinition, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "UserIdentityTokenDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_UserIdentityTokenBuilder) Build() (UserIdentityToken, error) {
 	if m.PolicyId == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/opcua/readwrite/model/UserIdentityTokenDefinition.go b/plc4go/protocols/opcua/readwrite/model/UserIdentityTokenDefinition.go
index 3e3ae949a91..881b46eabb8 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserIdentityTokenDefinition.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserIdentityTokenDefinition.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserManagementDataType.go b/plc4go/protocols/opcua/readwrite/model/UserManagementDataType.go
index 94e850c8e78..352b00990e4 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserManagementDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserManagementDataType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserNameIdentityToken.go b/plc4go/protocols/opcua/readwrite/model/UserNameIdentityToken.go
index f4d975e416b..05862cdb787 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserNameIdentityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserNameIdentityToken.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserTokenPolicy.go b/plc4go/protocols/opcua/readwrite/model/UserTokenPolicy.go
index b4e3e260b3b..7c801b277f5 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserTokenPolicy.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserTokenPolicy.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UserTokenType.go b/plc4go/protocols/opcua/readwrite/model/UserTokenType.go
index b0e1029c249..4dc0d8d6f11 100644
--- a/plc4go/protocols/opcua/readwrite/model/UserTokenType.go
+++ b/plc4go/protocols/opcua/readwrite/model/UserTokenType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/UtcTime.go b/plc4go/protocols/opcua/readwrite/model/UtcTime.go
index 438634adddc..2daa27b724c 100644
--- a/plc4go/protocols/opcua/readwrite/model/UtcTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/UtcTime.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/Variant.go b/plc4go/protocols/opcua/readwrite/model/Variant.go
index 6c88a6aeb65..14c825a7421 100644
--- a/plc4go/protocols/opcua/readwrite/model/Variant.go
+++ b/plc4go/protocols/opcua/readwrite/model/Variant.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go b/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
index 8c8f706142c..9dbf63841b3 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantBoolean.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantByte.go b/plc4go/protocols/opcua/readwrite/model/VariantByte.go
index 06acaf63ddc..642b8efdc72 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantByte.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantByteString.go b/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
index 9df36b758ac..ec45a24949c 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantByteString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go b/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
index 297a0e7896a..1cce7536006 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDataValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go b/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
index 1cd29ca74b1..efaff94639a 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDateTime.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go b/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
index 7d222a07516..b4d3b186b2b 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDiagnosticInfo.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantDouble.go b/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
index d2807df3b6d..5132db608da 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantDouble.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go b/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
index 500caeb5978..d66e416f1de 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantExpandedNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go b/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
index 7e6ecb4c354..60f2849e5d5 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantExtensionObject.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantFloat.go b/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
index 1c1e947ff81..789d7978590 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantFloat.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantGuid.go b/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
index 0fa20a94e4d..4003bfe58ca 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantGuid.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt16.go b/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
index bf571673535..7b10a62cfa7 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt16.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt32.go b/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
index 453f582cdf4..5bfcbc1327f 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt32.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantInt64.go b/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
index 191414cd303..641f81a5498 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantInt64.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go b/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
index e3eb2badea2..5bac4cebf0b 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantLocalizedText.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go b/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
index 76592a8fb6b..7b736998d38 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantNodeId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantNull.go b/plc4go/protocols/opcua/readwrite/model/VariantNull.go
index a0fbc0eed8f..e857cccc873 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantNull.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantNull.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go b/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
index 3576460475c..ad711019369 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantQualifiedName.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantSByte.go b/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
index 747f67812bb..811006d3c29 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantSByte.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go b/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
index b5b105286e8..e690120dc0c 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantStatusCode.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantString.go b/plc4go/protocols/opcua/readwrite/model/VariantString.go
index 7a57db1f610..6592be37530 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantString.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantString.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go b/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
index 7e469292122..66c3857f5d7 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt16.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go b/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
index 0d32caaf1e1..d3e5f333d7f 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt32.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go b/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
index 59749cef493..0d53ad6c288 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantUInt64.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantVariant.go b/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
index 80c8ba4719d..d684b76a6ad 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantVariant.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go b/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
index 6353971887e..3f077369fcb 100644
--- a/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/VariantXmlElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/VersionTime.go b/plc4go/protocols/opcua/readwrite/model/VersionTime.go
index 9f2eda0bc34..efbb142c7e9 100644
--- a/plc4go/protocols/opcua/readwrite/model/VersionTime.go
+++ b/plc4go/protocols/opcua/readwrite/model/VersionTime.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/ViewDescription.go b/plc4go/protocols/opcua/readwrite/model/ViewDescription.go
index e6f22e271c5..7102c1460f9 100644
--- a/plc4go/protocols/opcua/readwrite/model/ViewDescription.go
+++ b/plc4go/protocols/opcua/readwrite/model/ViewDescription.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/WriteRequest.go b/plc4go/protocols/opcua/readwrite/model/WriteRequest.go
index 667182996d6..86998625c14 100644
--- a/plc4go/protocols/opcua/readwrite/model/WriteRequest.go
+++ b/plc4go/protocols/opcua/readwrite/model/WriteRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -88,8 +90,6 @@ type WriteRequestBuilder interface {
 	WithMandatoryFields(requestHeader ExtensionObjectDefinition, noOfNodesToWrite int32, nodesToWrite []ExtensionObjectDefinition) WriteRequestBuilder
 	// WithRequestHeader adds RequestHeader (property field)
 	WithRequestHeader(ExtensionObjectDefinition) WriteRequestBuilder
-	// WithRequestHeaderBuilder adds RequestHeader (property field) which is build by the builder
-	WithRequestHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) WriteRequestBuilder
 	// WithNoOfNodesToWrite adds NoOfNodesToWrite (property field)
 	WithNoOfNodesToWrite(int32) WriteRequestBuilder
 	// WithNodesToWrite adds NodesToWrite (property field)
@@ -122,19 +122,6 @@ func (m *_WriteRequestBuilder) WithRequestHeader(requestHeader ExtensionObjectDe
 	return m
 }
 
-func (m *_WriteRequestBuilder) WithRequestHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) WriteRequestBuilder {
-	builder := builderSupplier(m.RequestHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.RequestHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_WriteRequestBuilder) WithNoOfNodesToWrite(noOfNodesToWrite int32) WriteRequestBuilder {
 	m.NoOfNodesToWrite = noOfNodesToWrite
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/WriteResponse.go b/plc4go/protocols/opcua/readwrite/model/WriteResponse.go
index 27f32e370c3..60e13903c36 100644
--- a/plc4go/protocols/opcua/readwrite/model/WriteResponse.go
+++ b/plc4go/protocols/opcua/readwrite/model/WriteResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -96,8 +98,6 @@ type WriteResponseBuilder interface {
 	WithMandatoryFields(responseHeader ExtensionObjectDefinition, noOfResults int32, results []StatusCode, noOfDiagnosticInfos int32, diagnosticInfos []DiagnosticInfo) WriteResponseBuilder
 	// WithResponseHeader adds ResponseHeader (property field)
 	WithResponseHeader(ExtensionObjectDefinition) WriteResponseBuilder
-	// WithResponseHeaderBuilder adds ResponseHeader (property field) which is build by the builder
-	WithResponseHeaderBuilder(func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) WriteResponseBuilder
 	// WithNoOfResults adds NoOfResults (property field)
 	WithNoOfResults(int32) WriteResponseBuilder
 	// WithResults adds Results (property field)
@@ -134,19 +134,6 @@ func (m *_WriteResponseBuilder) WithResponseHeader(responseHeader ExtensionObjec
 	return m
 }
 
-func (m *_WriteResponseBuilder) WithResponseHeaderBuilder(builderSupplier func(ExtensionObjectDefinitionBuilder) ExtensionObjectDefinitionBuilder) WriteResponseBuilder {
-	builder := builderSupplier(m.ResponseHeader.CreateExtensionObjectDefinitionBuilder())
-	var err error
-	m.ResponseHeader, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "ExtensionObjectDefinitionBuilder failed"))
-	}
-	return m
-}
-
 func (m *_WriteResponseBuilder) WithNoOfResults(noOfResults int32) WriteResponseBuilder {
 	m.NoOfResults = noOfResults
 	return m
diff --git a/plc4go/protocols/opcua/readwrite/model/WriteValue.go b/plc4go/protocols/opcua/readwrite/model/WriteValue.go
index 7b9a58f18d1..3cb09ca17d2 100644
--- a/plc4go/protocols/opcua/readwrite/model/WriteValue.go
+++ b/plc4go/protocols/opcua/readwrite/model/WriteValue.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/WriterGroupMessageDataType.go b/plc4go/protocols/opcua/readwrite/model/WriterGroupMessageDataType.go
index 3739f4aeede..4f3b0782cab 100644
--- a/plc4go/protocols/opcua/readwrite/model/WriterGroupMessageDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/WriterGroupMessageDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/WriterGroupTransportDataType.go b/plc4go/protocols/opcua/readwrite/model/WriterGroupTransportDataType.go
index 79fd7b9c3a9..2ac49a69a19 100644
--- a/plc4go/protocols/opcua/readwrite/model/WriterGroupTransportDataType.go
+++ b/plc4go/protocols/opcua/readwrite/model/WriterGroupTransportDataType.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/X509IdentityToken.go b/plc4go/protocols/opcua/readwrite/model/X509IdentityToken.go
index c0d6d828fa8..69be8cadc46 100644
--- a/plc4go/protocols/opcua/readwrite/model/X509IdentityToken.go
+++ b/plc4go/protocols/opcua/readwrite/model/X509IdentityToken.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/XVType.go b/plc4go/protocols/opcua/readwrite/model/XVType.go
index e873222c1fc..da10612ff85 100644
--- a/plc4go/protocols/opcua/readwrite/model/XVType.go
+++ b/plc4go/protocols/opcua/readwrite/model/XVType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/opcua/readwrite/model/XmlElement.go b/plc4go/protocols/opcua/readwrite/model/XmlElement.go
index a97fe7fd92a..b6ba3cd1c8f 100644
--- a/plc4go/protocols/opcua/readwrite/model/XmlElement.go
+++ b/plc4go/protocols/opcua/readwrite/model/XmlElement.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/ParserHelper.go b/plc4go/protocols/s7/readwrite/ParserHelper.go
index 13fb1724ea0..217928342c4 100644
--- a/plc4go/protocols/s7/readwrite/ParserHelper.go
+++ b/plc4go/protocols/s7/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/XmlParserHelper.go b/plc4go/protocols/s7/readwrite/XmlParserHelper.go
index 694f3495abb..8f201618a88 100644
--- a/plc4go/protocols/s7/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/s7/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go b/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
index 3097bb2bdff..9c02cc4b919 100644
--- a/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/Alarm8MessageQueryType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
index 7297bc9c437..a88178b93a3 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckObjectPushType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
index 4683c01e515..4f865bfc64d 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckPushType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
index 415ae7ed088..93c1223bd58 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckResponseType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
index 3ede55d480c..cd4c7d87eb1 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageAckType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
index 5b98c760a72..6d238367279 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectAckType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
index efd6595d2f8..e830059dee3 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectPushType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
index 4230ad44797..d181237068e 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageObjectQueryType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
index 0049e82d92f..9193dcc64b7 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessagePushType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go b/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
index 28005bde6ed..48db780dd7a 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmMessageQueryType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmStateType.go b/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
index 593f52ab4a2..53da643c283 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmStateType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AlarmType.go b/plc4go/protocols/s7/readwrite/model/AlarmType.go
index a0e59629b80..0df35d06749 100644
--- a/plc4go/protocols/s7/readwrite/model/AlarmType.go
+++ b/plc4go/protocols/s7/readwrite/model/AlarmType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go b/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
index 847802825ef..e320751035f 100644
--- a/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
+++ b/plc4go/protocols/s7/readwrite/model/AssociatedQueryValueType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go b/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
index 0eb57270522..cff2309c8dd 100644
--- a/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
+++ b/plc4go/protocols/s7/readwrite/model/AssociatedValueType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacket.go b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
index dd40f1c2b13..6280636867e 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacket.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -98,8 +100,6 @@ type COTPPacketBuilder interface {
 	WithParameters(...COTPParameter) COTPPacketBuilder
 	// WithPayload adds Payload (property field)
 	WithOptionalPayload(S7Message) COTPPacketBuilder
-	// WithOptionalPayloadBuilder adds Payload (property field) which is build by the builder
-	WithOptionalPayloadBuilder(func(S7MessageBuilder) S7MessageBuilder) COTPPacketBuilder
 	// Build builds the COTPPacket or returns an error if something is wrong
 	Build() (COTPPacketContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -133,19 +133,6 @@ func (m *_COTPPacketBuilder) WithOptionalPayload(payload S7Message) COTPPacketBu
 	return m
 }
 
-func (m *_COTPPacketBuilder) WithOptionalPayloadBuilder(builderSupplier func(S7MessageBuilder) S7MessageBuilder) COTPPacketBuilder {
-	builder := builderSupplier(m.Payload.CreateS7MessageBuilder())
-	var err error
-	m.Payload, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "S7MessageBuilder failed"))
-	}
-	return m
-}
-
 func (m *_COTPPacketBuilder) Build() (COTPPacketContract, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
index 1dece739e37..4bdf6578d5e 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
index 06789d6d64d..0777a672d5e 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketConnectionResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketData.go b/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
index 3a089b4f195..797eb1ad14c 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
index 51a6d113e7a..22f16e03289 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
index 746c637008c..c1be518203b 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketDisconnectResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go b/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
index 9cfc4c01b76..7bdd52af168 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPPacketTpduError.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameter.go b/plc4go/protocols/s7/readwrite/model/COTPParameter.go
index ee46e872e3f..54aa0801e67 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameter.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go b/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
index cfd5a56aee9..47c97735b1f 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterCalledTsap.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go b/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
index ba25de1cb5a..e30117c0611 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterCallingTsap.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go b/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
index c0797f582ad..cd2753eecd3 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterChecksum.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index 49ca7595f1a..de521c0f234 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go b/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
index 44b32d092a2..a39cb950e49 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPParameterTpduSize.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go b/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
index f4fd830d645..9448057e2f1 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPProtocolClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go b/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
index c9618a82285..d3754163cba 100644
--- a/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
+++ b/plc4go/protocols/s7/readwrite/model/COTPTpduSize.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/ControllerType.go b/plc4go/protocols/s7/readwrite/model/ControllerType.go
index 94ce02599dc..f327bbd103e 100644
--- a/plc4go/protocols/s7/readwrite/model/ControllerType.go
+++ b/plc4go/protocols/s7/readwrite/model/ControllerType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go b/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
index df3ef139d2d..8f1b250c887 100644
--- a/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
+++ b/plc4go/protocols/s7/readwrite/model/CpuSubscribeEvents.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/CycServiceItemAnyType.go b/plc4go/protocols/s7/readwrite/model/CycServiceItemAnyType.go
index 5635a41ddae..e35fba8061f 100644
--- a/plc4go/protocols/s7/readwrite/model/CycServiceItemAnyType.go
+++ b/plc4go/protocols/s7/readwrite/model/CycServiceItemAnyType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/CycServiceItemDbReadType.go b/plc4go/protocols/s7/readwrite/model/CycServiceItemDbReadType.go
index ecb6ec306d0..56bc362c564 100644
--- a/plc4go/protocols/s7/readwrite/model/CycServiceItemDbReadType.go
+++ b/plc4go/protocols/s7/readwrite/model/CycServiceItemDbReadType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go b/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
index e4cfb4c56a2..a6ecc231dee 100644
--- a/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
+++ b/plc4go/protocols/s7/readwrite/model/CycServiceItemType.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/DataItem.go b/plc4go/protocols/s7/readwrite/model/DataItem.go
index 2176ecb61ca..1db506ae468 100644
--- a/plc4go/protocols/s7/readwrite/model/DataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/DataItem.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go b/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
index f1f9c1e6d07..001e4107dff 100644
--- a/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
+++ b/plc4go/protocols/s7/readwrite/model/DataTransportErrorCode.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/DataTransportSize.go b/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
index e91d0bf66e2..a015c922440 100644
--- a/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
+++ b/plc4go/protocols/s7/readwrite/model/DataTransportSize.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/DateAndTime.go b/plc4go/protocols/s7/readwrite/model/DateAndTime.go
index 47629ec9801..53e375b41f1 100644
--- a/plc4go/protocols/s7/readwrite/model/DateAndTime.go
+++ b/plc4go/protocols/s7/readwrite/model/DateAndTime.go
@@ -22,12 +22,14 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/DeviceGroup.go b/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
index 77f737b172e..b4e22fe6682 100644
--- a/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
+++ b/plc4go/protocols/s7/readwrite/model/DeviceGroup.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/EventType.go b/plc4go/protocols/s7/readwrite/model/EventType.go
index 8df18e42d58..3333cd55711 100644
--- a/plc4go/protocols/s7/readwrite/model/EventType.go
+++ b/plc4go/protocols/s7/readwrite/model/EventType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/MemoryArea.go b/plc4go/protocols/s7/readwrite/model/MemoryArea.go
index 12e49ef3e8e..dffde148143 100644
--- a/plc4go/protocols/s7/readwrite/model/MemoryArea.go
+++ b/plc4go/protocols/s7/readwrite/model/MemoryArea.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go b/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
index c0e27049b67..2e157be82e4 100644
--- a/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
+++ b/plc4go/protocols/s7/readwrite/model/ModeTransitionType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/QueryType.go b/plc4go/protocols/s7/readwrite/model/QueryType.go
index 3dd70830b24..f706e4319fa 100644
--- a/plc4go/protocols/s7/readwrite/model/QueryType.go
+++ b/plc4go/protocols/s7/readwrite/model/QueryType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7Address.go b/plc4go/protocols/s7/readwrite/model/S7Address.go
index 9da62cb72d7..875cebc95fc 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Address.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Address.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7AddressAny.go b/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
index ad74a757f57..0d1730ef931 100644
--- a/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
+++ b/plc4go/protocols/s7/readwrite/model/S7AddressAny.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go b/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
index a87ee89d6bd..7a5e3aa5d0d 100644
--- a/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
+++ b/plc4go/protocols/s7/readwrite/model/S7DataAlarmMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7Message.go b/plc4go/protocols/s7/readwrite/model/S7Message.go
index 3984fd4d14e..889cd4425d2 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Message.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Message.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -101,12 +103,8 @@ type S7MessageBuilder interface {
 	WithTpduReference(uint16) S7MessageBuilder
 	// WithParameter adds Parameter (property field)
 	WithOptionalParameter(S7Parameter) S7MessageBuilder
-	// WithOptionalParameterBuilder adds Parameter (property field) which is build by the builder
-	WithOptionalParameterBuilder(func(S7ParameterBuilder) S7ParameterBuilder) S7MessageBuilder
 	// WithPayload adds Payload (property field)
 	WithOptionalPayload(S7Payload) S7MessageBuilder
-	// WithOptionalPayloadBuilder adds Payload (property field) which is build by the builder
-	WithOptionalPayloadBuilder(func(S7PayloadBuilder) S7PayloadBuilder) S7MessageBuilder
 	// Build builds the S7Message or returns an error if something is wrong
 	Build() (S7MessageContract, error)
 	// MustBuild does the same as Build but panics on error
@@ -140,37 +138,11 @@ func (m *_S7MessageBuilder) WithOptionalParameter(parameter S7Parameter) S7Messa
 	return m
 }
 
-func (m *_S7MessageBuilder) WithOptionalParameterBuilder(builderSupplier func(S7ParameterBuilder) S7ParameterBuilder) S7MessageBuilder {
-	builder := builderSupplier(m.Parameter.CreateS7ParameterBuilder())
-	var err error
-	m.Parameter, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "S7ParameterBuilder failed"))
-	}
-	return m
-}
-
 func (m *_S7MessageBuilder) WithOptionalPayload(payload S7Payload) S7MessageBuilder {
 	m.Payload = payload
 	return m
 }
 
-func (m *_S7MessageBuilder) WithOptionalPayloadBuilder(builderSupplier func(S7PayloadBuilder) S7PayloadBuilder) S7MessageBuilder {
-	builder := builderSupplier(m.Payload.CreateS7PayloadBuilder())
-	var err error
-	m.Payload, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "S7PayloadBuilder failed"))
-	}
-	return m
-}
-
 func (m *_S7MessageBuilder) Build() (S7MessageContract, error) {
 	if m.err != nil {
 		return nil, errors.Wrap(m.err, "error occurred during build")
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go b/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
index b4b23c66956..b3df0943e53 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageObjectRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go b/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
index 58bb65eebe1..a2e31151e4d 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageObjectResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageRequest.go b/plc4go/protocols/s7/readwrite/model/S7MessageRequest.go
index 1a619b145d2..ec8e339c8d2 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageResponse.go b/plc4go/protocols/s7/readwrite/model/S7MessageResponse.go
index db3fd1ed113..46fdb0d4b49 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageResponseData.go b/plc4go/protocols/s7/readwrite/model/S7MessageResponseData.go
index b6cba8d404c..67757914e3f 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageResponseData.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageResponseData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7MessageUserData.go b/plc4go/protocols/s7/readwrite/model/S7MessageUserData.go
index f9930588e88..c5e72d3a846 100644
--- a/plc4go/protocols/s7/readwrite/model/S7MessageUserData.go
+++ b/plc4go/protocols/s7/readwrite/model/S7MessageUserData.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7Parameter.go b/plc4go/protocols/s7/readwrite/model/S7Parameter.go
index bce3627914a..c99d4542d23 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Parameter.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Parameter.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go b/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
index 470c6d04638..4911957e3b0 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterModeTransition.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarRequest.go b/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarRequest.go
index 192740cf228..c11d410ef52 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarResponse.go
index 285bf5fc4a0..3a721ab9de6 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterReadVarResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go b/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
index 72fd77ae60b..0143265a3f2 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterSetupCommunication.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterUserData.go b/plc4go/protocols/s7/readwrite/model/S7ParameterUserData.go
index 619e0c1f8e4..10e36791535 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterUserData.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterUserData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
index b7087b4bcc5..89838ed88c4 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
index 810b4a586fd..d757cbe68c4 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarRequest.go b/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarRequest.go
index e1f34c4a977..ac523f309a4 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarResponse.go
index 9c3d0d9d751..468e8ddf281 100644
--- a/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7ParameterWriteVarResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7Payload.go b/plc4go/protocols/s7/readwrite/model/S7Payload.go
index 43c298299f3..9449a801d73 100644
--- a/plc4go/protocols/s7/readwrite/model/S7Payload.go
+++ b/plc4go/protocols/s7/readwrite/model/S7Payload.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarm8.go b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarm8.go
index 00712921781..44cdb075729 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarm8.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarm8.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmAckInd.go b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmAckInd.go
index a887be010ad..ac6c47078b3 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmAckInd.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmAckInd.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmS.go b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmS.go
index b24a6da1e42..a387f9c9163 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmS.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmS.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSC.go b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSC.go
index 5f6cef3d2c1..a33f135bc98 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSC.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSC.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSQ.go b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSQ.go
index 87b5bd0cf61..e64c50f865e 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSQ.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadAlarmSQ.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadDiagnosticMessage.go b/plc4go/protocols/s7/readwrite/model/S7PayloadDiagnosticMessage.go
index 1bf86a2a3b8..6490354c8d9 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadDiagnosticMessage.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadDiagnosticMessage.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadNotify.go b/plc4go/protocols/s7/readwrite/model/S7PayloadNotify.go
index 7b149bf01ed..0e69301b064 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadNotify.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadNotify.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadNotify8.go b/plc4go/protocols/s7/readwrite/model/S7PayloadNotify8.go
index 55841f9a63e..5b8328c3c27 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadNotify8.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadNotify8.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
index ee42ddbc3fa..76b8637fa3c 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
index 1107d952ca0..cddd7ca6ac6 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
index f8791cd80b7..ec0a8c150a2 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFRequest.go
index 7ddf36bee9d..bcddf3bcbfc 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFResponse.go
index 73cf9e5904e..ca3762b07df 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkFResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkRequest.go
index 391acbd1587..e2af91b25a7 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkResponse.go
index d0b26d626ce..35f9a381a50 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetRequest.go
index b498a7915ae..39a1c8aaa49 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetResponse.go
index 1b9d00ea46a..aef3d2ba6eb 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemClkSetResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.go
index 386bc66ca8d..cf5c5830bc2 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.go
index 9f0db49c450..732a940e3cb 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
index 3fbfe36a632..355501be64f 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.go
index afc5dd4559d..ad50b3ad287 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
index 8ad28fbb17e..00451a7fbb8 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
index eed9ce852c3..334e2abd3c5 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.go
index 5d5f56567cc..397a1faf045 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
index 1a4f1003ce7..87ba21433a4 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
index 86f32622616..71c4357ac3f 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.go
index 80db1b5ea66..52b7b49f10e 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
index c0116b36558..61fc884124b 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
index bbf519d9d64..0cb25fb8718 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.go
index 9f00196115e..731b911ad32 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.go
index 85e9c0e7e23..a2f5454507e 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesErrorResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesErrorResponse.go
index 261c5cd4eea..242c8559fec 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesErrorResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesErrorResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesPush.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesPush.go
index e73cda18970..01e5003c9b1 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesPush.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesPush.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeRequest.go
index bd6548f442c..f09f19078f3 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeResponse.go
index 1a5341d033c..afc9644496b 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesSubscribeResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.go
index 3832ceeed8c..c153f7c97f9 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.go
index f48c7565539..36e0ec8c529 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.go
@@ -22,9 +22,11 @@ package model
 import (
 	"context"
 	"fmt"
-	"github.com/apache/plc4x/plc4go/spi/utils"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
index 4d4751f7c35..53128262824 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
index 17d7bba001a..156eff83048 100644
--- a/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
+++ b/plc4go/protocols/s7/readwrite/model/S7PayloadWriteVarResponse.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go b/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
index ec194b8b068..49705e4d3c9 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarPayloadDataItem.go
@@ -22,12 +22,14 @@ package model
 import (
 	"context"
 	"fmt"
+	"math"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
-	"math"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go b/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
index 05025cd545e..e9e3df5844c 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarPayloadStatusItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
index aee14c6e7bb..a054ecb1322 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItemAddress.go b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItemAddress.go
index 8daafa8d279..82377cfea2d 100644
--- a/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItemAddress.go
+++ b/plc4go/protocols/s7/readwrite/model/S7VarRequestParameterItemAddress.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -80,8 +82,6 @@ type S7VarRequestParameterItemAddressBuilder interface {
 	WithMandatoryFields(address S7Address) S7VarRequestParameterItemAddressBuilder
 	// WithAddress adds Address (property field)
 	WithAddress(S7Address) S7VarRequestParameterItemAddressBuilder
-	// WithAddressBuilder adds Address (property field) which is build by the builder
-	WithAddressBuilder(func(S7AddressBuilder) S7AddressBuilder) S7VarRequestParameterItemAddressBuilder
 	// Build builds the S7VarRequestParameterItemAddress or returns an error if something is wrong
 	Build() (S7VarRequestParameterItemAddress, error)
 	// MustBuild does the same as Build but panics on error
@@ -110,19 +110,6 @@ func (m *_S7VarRequestParameterItemAddressBuilder) WithAddress(address S7Address
 	return m
 }
 
-func (m *_S7VarRequestParameterItemAddressBuilder) WithAddressBuilder(builderSupplier func(S7AddressBuilder) S7AddressBuilder) S7VarRequestParameterItemAddressBuilder {
-	builder := builderSupplier(m.Address.CreateS7AddressBuilder())
-	var err error
-	m.Address, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "S7AddressBuilder failed"))
-	}
-	return m
-}
-
 func (m *_S7VarRequestParameterItemAddressBuilder) Build() (S7VarRequestParameterItemAddress, error) {
 	if m.Address == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/s7/readwrite/model/State.go b/plc4go/protocols/s7/readwrite/model/State.go
index 85486cc4cbe..443fa82825f 100644
--- a/plc4go/protocols/s7/readwrite/model/State.go
+++ b/plc4go/protocols/s7/readwrite/model/State.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SubItem.go b/plc4go/protocols/s7/readwrite/model/SubItem.go
index 30628c233e3..db596204180 100644
--- a/plc4go/protocols/s7/readwrite/model/SubItem.go
+++ b/plc4go/protocols/s7/readwrite/model/SubItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go b/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
index a24de5ddfd1..f9a9a999346 100644
--- a/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
+++ b/plc4go/protocols/s7/readwrite/model/SyntaxIdType.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go b/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
index 76f725633fe..a8caaa441ad 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlDataTreeItem.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SzlId.go b/plc4go/protocols/s7/readwrite/model/SzlId.go
index c16f6ef9f20..5799dc6f812 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlId.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlId.go
@@ -22,11 +22,13 @@ package model
 import (
 	"context"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go b/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
index 385b3e104c1..10d659555e9 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlModuleTypeClass.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/SzlSublist.go b/plc4go/protocols/s7/readwrite/model/SzlSublist.go
index a32e89a5582..83ea77f846d 100644
--- a/plc4go/protocols/s7/readwrite/model/SzlSublist.go
+++ b/plc4go/protocols/s7/readwrite/model/SzlSublist.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
index 350218f617f..beac54c90de 100644
--- a/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
+++ b/plc4go/protocols/s7/readwrite/model/TPKTPacket.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
@@ -79,8 +81,6 @@ type TPKTPacketBuilder interface {
 	WithMandatoryFields(payload COTPPacket) TPKTPacketBuilder
 	// WithPayload adds Payload (property field)
 	WithPayload(COTPPacket) TPKTPacketBuilder
-	// WithPayloadBuilder adds Payload (property field) which is build by the builder
-	WithPayloadBuilder(func(COTPPacketBuilder) COTPPacketBuilder) TPKTPacketBuilder
 	// Build builds the TPKTPacket or returns an error if something is wrong
 	Build() (TPKTPacket, error)
 	// MustBuild does the same as Build but panics on error
@@ -109,19 +109,6 @@ func (m *_TPKTPacketBuilder) WithPayload(payload COTPPacket) TPKTPacketBuilder {
 	return m
 }
 
-func (m *_TPKTPacketBuilder) WithPayloadBuilder(builderSupplier func(COTPPacketBuilder) COTPPacketBuilder) TPKTPacketBuilder {
-	builder := builderSupplier(m.Payload.CreateCOTPPacketBuilder())
-	var err error
-	m.Payload, err = builder.Build()
-	if err != nil {
-		if m.err == nil {
-			m.err = &utils.MultiError{MainError: errors.New("sub builder failed")}
-		}
-		m.err.Append(errors.Wrap(err, "COTPPacketBuilder failed"))
-	}
-	return m
-}
-
 func (m *_TPKTPacketBuilder) Build() (TPKTPacket, error) {
 	if m.Payload == nil {
 		if m.err == nil {
diff --git a/plc4go/protocols/s7/readwrite/model/TimeBase.go b/plc4go/protocols/s7/readwrite/model/TimeBase.go
index 113994b0fca..d91a1094f40 100644
--- a/plc4go/protocols/s7/readwrite/model/TimeBase.go
+++ b/plc4go/protocols/s7/readwrite/model/TimeBase.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/s7/readwrite/model/TransportSize.go b/plc4go/protocols/s7/readwrite/model/TransportSize.go
index fce8e83d3af..e0a872797f7 100644
--- a/plc4go/protocols/s7/readwrite/model/TransportSize.go
+++ b/plc4go/protocols/s7/readwrite/model/TransportSize.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/simulated/readwrite/ParserHelper.go b/plc4go/protocols/simulated/readwrite/ParserHelper.go
index 27f3712001b..ec534ff6676 100644
--- a/plc4go/protocols/simulated/readwrite/ParserHelper.go
+++ b/plc4go/protocols/simulated/readwrite/ParserHelper.go
@@ -22,9 +22,10 @@ package readwrite
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/simulated/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/simulated/readwrite/XmlParserHelper.go b/plc4go/protocols/simulated/readwrite/XmlParserHelper.go
index 1472a81c987..6bebd658c7e 100644
--- a/plc4go/protocols/simulated/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/simulated/readwrite/XmlParserHelper.go
@@ -24,9 +24,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	. "github.com/apache/plc4x/plc4go/protocols/simulated/readwrite/model"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/simulated/readwrite/model/DataItem.go b/plc4go/protocols/simulated/readwrite/model/DataItem.go
index 2f6dc86dea7..42846353307 100644
--- a/plc4go/protocols/simulated/readwrite/model/DataItem.go
+++ b/plc4go/protocols/simulated/readwrite/model/DataItem.go
@@ -21,11 +21,13 @@ package model
 
 import (
 	"context"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	api "github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 	"github.com/apache/plc4x/plc4go/spi/values"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/simulated/readwrite/model/Dummy.go b/plc4go/protocols/simulated/readwrite/model/Dummy.go
index 6e6464262e2..b8de220ae09 100644
--- a/plc4go/protocols/simulated/readwrite/model/Dummy.go
+++ b/plc4go/protocols/simulated/readwrite/model/Dummy.go
@@ -23,12 +23,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+
 	"github.com/apache/plc4x/plc4go/spi/codegen"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
 	. "github.com/apache/plc4x/plc4go/spi/codegen/io"
 	"github.com/apache/plc4x/plc4go/spi/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
 )
 
 // Code generated by code-generation. DO NOT EDIT.
diff --git a/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go b/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
index a3de76b70c0..a96c0ca7b35 100644
--- a/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
+++ b/plc4go/protocols/simulated/readwrite/model/SimulatedDataTypeSizes.go
@@ -23,10 +23,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/plc4x/plc4go/spi/utils"
-
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
+
+	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 // Code generated by code-generation. DO NOT EDIT.