You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/03/07 14:08:10 UTC

[plc4x] branch develop updated: fix(plc4go/codegen): fixed issue were a discriminator field overshadows a virtual field

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new 526bedf  fix(plc4go/codegen): fixed issue were a discriminator field overshadows a virtual field
526bedf is described below

commit 526bedf5eccb8955b983f353d2c55efda0823b7f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Mar 7 15:06:25 2022 +0100

    fix(plc4go/codegen): fixed issue were a discriminator field overshadows a virtual field
---
 .../language/go/GoLanguageTemplateHelper.java      |  2 +-
 .../resources/templates/go/model-template.go.ftlh  | 18 +++-------
 .../readwrite/model/CIPEncapsulationPacket.go      | 14 ++++----
 .../readwrite/model/CIPEncapsulationReadRequest.go |  2 +-
 .../model/CIPEncapsulationReadResponse.go          |  2 +-
 .../readwrite/model/DF1CommandRequestMessage.go    |  2 +-
 ...mandResponseMessageProtectedTypedLogicalRead.go |  2 +-
 .../abeth/readwrite/model/DF1RequestCommand.go     |  6 ++--
 .../abeth/readwrite/model/DF1RequestMessage.go     | 14 ++++----
 .../model/DF1RequestProtectedTypedLogicalRead.go   | 10 +++---
 .../abeth/readwrite/model/DF1ResponseMessage.go    | 14 ++++----
 .../model/AdsAddDeviceNotificationRequest.go       | 12 +++----
 .../model/AdsAddDeviceNotificationResponse.go      |  4 +--
 .../internal/plc4go/ads/readwrite/model/AdsData.go |  8 ++---
 .../model/AdsDeleteDeviceNotificationRequest.go    |  2 +-
 .../model/AdsDeleteDeviceNotificationResponse.go   |  2 +-
 .../model/AdsDeviceNotificationRequest.go          |  6 ++--
 .../ads/readwrite/model/AdsMultiRequestItem.go     |  4 +--
 .../ads/readwrite/model/AdsMultiRequestItemRead.go |  6 ++--
 .../model/AdsMultiRequestItemReadWrite.go          |  8 ++---
 .../readwrite/model/AdsMultiRequestItemWrite.go    |  6 ++--
 .../ads/readwrite/model/AdsNotificationSample.go   |  6 ++--
 .../readwrite/model/AdsReadDeviceInfoResponse.go   | 10 +++---
 .../plc4go/ads/readwrite/model/AdsReadRequest.go   |  6 ++--
 .../plc4go/ads/readwrite/model/AdsReadResponse.go  |  4 +--
 .../ads/readwrite/model/AdsReadStateResponse.go    |  6 ++--
 .../ads/readwrite/model/AdsReadWriteRequest.go     | 10 +++---
 .../ads/readwrite/model/AdsReadWriteResponse.go    |  4 +--
 .../plc4go/ads/readwrite/model/AdsStampHeader.go   |  6 ++--
 .../ads/readwrite/model/AdsWriteControlRequest.go  |  6 ++--
 .../ads/readwrite/model/AdsWriteControlResponse.go |  2 +-
 .../plc4go/ads/readwrite/model/AdsWriteRequest.go  |  6 ++--
 .../plc4go/ads/readwrite/model/AdsWriteResponse.go |  2 +-
 .../plc4go/ads/readwrite/model/AmsNetId.go         | 12 +++----
 .../plc4go/ads/readwrite/model/AmsPacket.go        | 18 +++++-----
 .../readwrite/model/AmsSerialAcknowledgeFrame.go   | 12 +++----
 .../plc4go/ads/readwrite/model/AmsSerialFrame.go   | 14 ++++----
 .../ads/readwrite/model/AmsSerialResetFrame.go     | 12 +++----
 .../plc4go/ads/readwrite/model/AmsTCPPacket.go     |  2 +-
 .../internal/plc4go/ads/readwrite/model/State.go   | 18 +++++-----
 .../plc4go/bacnetip/readwrite/model/APDU.go        |  6 ++--
 .../plc4go/bacnetip/readwrite/model/APDUAbort.go   |  6 ++--
 .../bacnetip/readwrite/model/APDUComplexAck.go     | 16 ++++-----
 .../readwrite/model/APDUConfirmedRequest.go        | 18 +++++-----
 .../plc4go/bacnetip/readwrite/model/APDUError.go   |  4 +--
 .../plc4go/bacnetip/readwrite/model/APDUReject.go  |  4 +--
 .../bacnetip/readwrite/model/APDUSegmentAck.go     | 10 +++---
 .../bacnetip/readwrite/model/APDUSimpleAck.go      |  4 +--
 .../readwrite/model/APDUUnconfirmedRequest.go      |  2 +-
 .../plc4go/bacnetip/readwrite/model/APDUUnknown.go |  2 +-
 .../bacnetip/readwrite/model/BACnetAction.go       |  6 ++--
 .../readwrite/model/BACnetActionCommand.go         | 18 +++++-----
 .../bacnetip/readwrite/model/BACnetAddress.go      |  4 +--
 .../readwrite/model/BACnetApplicationTag.go        |  8 ++---
 .../model/BACnetApplicationTagBitString.go         |  9 +----
 .../readwrite/model/BACnetApplicationTagBoolean.go | 11 ++-----
 .../model/BACnetApplicationTagCharacterString.go   | 11 ++-----
 .../readwrite/model/BACnetApplicationTagDate.go    |  9 +----
 .../readwrite/model/BACnetApplicationTagDouble.go  | 11 ++-----
 .../model/BACnetApplicationTagEnumerated.go        | 11 ++-----
 .../readwrite/model/BACnetApplicationTagNull.go    |  7 ----
 .../model/BACnetApplicationTagObjectIdentifier.go  | 13 ++------
 .../model/BACnetApplicationTagOctetString.go       | 11 ++-----
 .../readwrite/model/BACnetApplicationTagReal.go    | 11 ++-----
 .../model/BACnetApplicationTagSignedInteger.go     | 11 ++-----
 .../readwrite/model/BACnetApplicationTagTime.go    |  9 +----
 .../model/BACnetApplicationTagUnsignedInteger.go   | 11 ++-----
 .../bacnetip/readwrite/model/BACnetBinaryPV.go     |  6 ++--
 .../readwrite/model/BACnetConfirmedServiceACK.go   |  6 ++--
 .../model/BACnetConfirmedServiceRequest.go         |  6 ++--
 .../BACnetConfirmedServiceRequestAtomicReadFile.go |  4 +--
 ...tConfirmedServiceRequestAtomicReadFileRecord.go | 11 ++-----
 ...tConfirmedServiceRequestAtomicReadFileStream.go | 11 ++-----
 ...edServiceRequestAtomicReadFileStreamOrRecord.go | 10 +++---
 ...BACnetConfirmedServiceRequestAtomicWriteFile.go | 10 +++---
 ...firmedServiceRequestConfirmedCOVNotification.go | 10 +++---
 ...rmedServiceRequestConfirmedEventNotification.go | 26 +++++++--------
 ...ACnetConfirmedServiceRequestConfirmedUnknown.go |  2 +-
 ...rmedServiceRequestDeviceCommunicationControl.go |  6 ++--
 .../BACnetConfirmedServiceRequestReadProperty.go   |  6 ++--
 ...tConfirmedServiceRequestReadPropertyMultiple.go |  2 +-
 ...netConfirmedServiceRequestReinitializeDevice.go |  4 +--
 ...erviceRequestReinitializeDeviceEnableDisable.go |  8 ++---
 .../BACnetConfirmedServiceRequestSubscribeCOV.go   |  8 ++---
 .../BACnetConfirmedServiceRequestWriteProperty.go  | 10 +++---
 .../readwrite/model/BACnetConstructedData.go       | 12 +++----
 .../model/BACnetConstructedDataCommand.go          | 14 ++------
 .../model/BACnetConstructedDataElement.go          | 16 ++++-----
 .../model/BACnetConstructedDataEventTimestamps.go  | 14 ++------
 .../model/BACnetConstructedDataLifeSafetyZone.go   | 10 +-----
 .../model/BACnetConstructedDataUnspecified.go      | 16 +++------
 .../bacnetip/readwrite/model/BACnetContextTag.go   | 12 +++----
 .../readwrite/model/BACnetContextTagBitString.go   |  2 +-
 .../readwrite/model/BACnetContextTagBoolean.go     |  6 ++--
 .../model/BACnetContextTagCharacterString.go       |  2 +-
 .../readwrite/model/BACnetContextTagDate.go        |  2 +-
 .../readwrite/model/BACnetContextTagDeviceState.go |  2 +-
 .../readwrite/model/BACnetContextTagDouble.go      |  4 +--
 .../readwrite/model/BACnetContextTagEnumerated.go  |  4 +--
 .../readwrite/model/BACnetContextTagEventState.go  |  6 ++--
 .../readwrite/model/BACnetContextTagEventType.go   |  6 ++--
 .../readwrite/model/BACnetContextTagNotifyType.go  |  2 +-
 .../model/BACnetContextTagObjectIdentifier.go      |  6 ++--
 .../readwrite/model/BACnetContextTagOctetString.go |  2 +-
 .../model/BACnetContextTagPropertyIdentifier.go    |  6 ++--
 .../readwrite/model/BACnetContextTagReal.go        |  4 +--
 .../model/BACnetContextTagSignedInteger.go         |  4 +--
 .../readwrite/model/BACnetContextTagTime.go        |  2 +-
 .../model/BACnetContextTagUnsignedInteger.go       |  4 +--
 .../bacnetip/readwrite/model/BACnetDateTime.go     |  8 ++---
 .../model/BACnetDeviceObjectPropertyReference.go   | 12 +++----
 .../plc4go/bacnetip/readwrite/model/BACnetError.go | 10 +++---
 .../model/BACnetNotificationParameters.go          | 10 +++---
 .../BACnetNotificationParametersBufferReady.go     | 17 +++-------
 ...ACnetNotificationParametersChangeOfBitString.go | 15 +++------
 .../BACnetNotificationParametersChangeOfState.go   | 15 +++------
 .../BACnetNotificationParametersChangeOfValue.go   | 15 +++------
 ...tNotificationParametersChangeOfValueNewValue.go | 10 +++---
 ...onParametersChangeOfValueNewValueChangedBits.go |  9 +----
 ...nParametersChangeOfValueNewValueChangedValue.go |  9 +----
 ...BACnetNotificationParametersComplexEventType.go |  9 +----
 .../model/BACnetNotificationParametersExtended.go  | 17 +++-------
 ...CnetNotificationParametersExtendedParameters.go | 32 +++++++++---------
 .../BACnetNotificationParametersFloatingLimit.go   | 19 ++++-------
 .../BACnetNotificationParametersOutOfRange.go      | 19 ++++-------
 .../BACnetNotificationParametersUnsignedRange.go   | 17 +++-------
 .../readwrite/model/BACnetPropertyReference.go     |  4 +--
 .../readwrite/model/BACnetPropertyStates.go        | 10 +++---
 .../readwrite/model/BACnetPropertyStatesAction.go  |  9 +----
 .../model/BACnetPropertyStatesBinaryValue.go       |  9 +----
 .../readwrite/model/BACnetPropertyStatesBoolean.go |  9 +----
 .../readwrite/model/BACnetPropertyValue.go         |  8 ++---
 .../readwrite/model/BACnetPropertyValues.go        |  6 ++--
 .../model/BACnetReadAccessSpecification.go         |  8 ++---
 .../bacnetip/readwrite/model/BACnetSegmentation.go | 10 +++---
 .../bacnetip/readwrite/model/BACnetServiceAck.go   |  6 ++--
 .../model/BACnetServiceAckAtomicReadFile.go        |  4 +--
 .../model/BACnetServiceAckAtomicReadFileRecord.go  | 13 ++------
 .../model/BACnetServiceAckAtomicReadFileStream.go  | 11 ++-----
 ...BACnetServiceAckAtomicReadFileStreamOrRecord.go | 10 +++---
 .../model/BACnetServiceAckAtomicWriteFile.go       |  2 +-
 .../model/BACnetServiceAckReadProperty.go          |  8 ++---
 .../bacnetip/readwrite/model/BACnetStatusFlags.go  | 10 +++---
 .../bacnetip/readwrite/model/BACnetTagHeader.go    | 24 +++++++-------
 .../readwrite/model/BACnetTagPayloadBitString.go   |  6 ++--
 .../readwrite/model/BACnetTagPayloadBoolean.go     |  6 ++--
 .../model/BACnetTagPayloadCharacterString.go       |  6 ++--
 .../readwrite/model/BACnetTagPayloadDate.go        | 30 ++++++++---------
 .../readwrite/model/BACnetTagPayloadDouble.go      |  2 +-
 .../readwrite/model/BACnetTagPayloadEnumerated.go  |  4 +--
 .../model/BACnetTagPayloadObjectIdentifier.go      |  8 ++---
 .../readwrite/model/BACnetTagPayloadOctetString.go |  4 +--
 .../readwrite/model/BACnetTagPayloadReal.go        |  2 +-
 .../model/BACnetTagPayloadSignedInteger.go         | 34 +++++++++----------
 .../readwrite/model/BACnetTagPayloadTime.go        | 18 +++++-----
 .../model/BACnetTagPayloadUnsignedInteger.go       | 34 +++++++++----------
 .../bacnetip/readwrite/model/BACnetTimeStamp.go    | 10 +++---
 .../readwrite/model/BACnetTimeStampDateTime.go     |  9 +----
 .../readwrite/model/BACnetTimeStampSequence.go     |  9 +----
 .../readwrite/model/BACnetTimeStampTime.go         |  9 +----
 .../model/BACnetUnconfirmedServiceRequest.go       |  6 ++--
 .../model/BACnetUnconfirmedServiceRequestIAm.go    |  8 ++---
 .../model/BACnetUnconfirmedServiceRequestIHave.go  |  6 ++--
 ...UnconfirmedServiceRequestTimeSynchronization.go |  4 +--
 ...rmedServiceRequestUnconfirmedCOVNotification.go | 10 +++---
 ...rmedServiceRequestUnconfirmedPrivateTransfer.go |  6 ++--
 ...tUnconfirmedServiceRequestUnconfirmedUnknown.go |  2 +-
 .../model/BACnetUnconfirmedServiceRequestWhoHas.go |  8 ++---
 .../model/BACnetUnconfirmedServiceRequestWhoIs.go  |  4 +--
 .../plc4go/bacnetip/readwrite/model/BVLC.go        |  8 ++---
 .../model/BVLCDistributeBroadcastToNetwork.go      |  2 +-
 .../bacnetip/readwrite/model/BVLCForwardedNPDU.go  |  6 ++--
 .../readwrite/model/BVLCOriginalBroadcastNPDU.go   |  2 +-
 .../readwrite/model/BVLCOriginalUnicastNPDU.go     |  2 +-
 .../readwrite/model/BVLCRegisterForeignDevice.go   |  2 +-
 .../plc4go/bacnetip/readwrite/model/BVLCResult.go  |  2 +-
 .../model/BVLCWriteBroadcastDistributionTable.go   |  2 +-
 .../BVLCWriteBroadcastDistributionTableEntry.go    |  6 ++--
 .../plc4go/bacnetip/readwrite/model/NLM.go         |  8 ++---
 .../model/NLMDisconnectConnectionToNetwork.go      |  2 +-
 .../model/NLMEstablishConnectionToNetwork.go       |  4 +--
 .../readwrite/model/NLMIAmRouterToNetwork.go       |  2 +-
 .../readwrite/model/NLMICouldBeRouterToNetwork.go  |  4 +--
 .../readwrite/model/NLMInitalizeRoutingTable.go    |  4 +--
 .../readwrite/model/NLMInitalizeRoutingTableAck.go |  4 +--
 .../model/NLMInitalizeRoutingTablePortMapping.go   |  8 ++---
 .../readwrite/model/NLMRejectRouterToNetwork.go    |  4 +--
 .../readwrite/model/NLMRouterAvailableToNetwork.go |  2 +-
 .../readwrite/model/NLMRouterBusyToNetwork.go      |  2 +-
 .../readwrite/model/NLMWhoIsRouterToNetwork.go     |  2 +-
 .../plc4go/bacnetip/readwrite/model/NPDU.go        | 28 ++++++++--------
 .../plc4go/bacnetip/readwrite/model/NPDUControl.go | 10 +++---
 .../internal/plc4go/cbus/readwrite/model/Alpha.go  |  2 +-
 .../plc4go/cbus/readwrite/model/BridgeAddress.go   |  2 +-
 .../plc4go/cbus/readwrite/model/BridgeCount.go     |  2 +-
 .../plc4go/cbus/readwrite/model/CALData.go         |  6 ++--
 .../readwrite/model/CALDataReplyAcknowledge.go     | 11 ++-----
 .../cbus/readwrite/model/CALDataReplyReply.go      | 11 ++-----
 .../cbus/readwrite/model/CALDataReplyStatus.go     | 13 ++------
 .../readwrite/model/CALDataReplyStatusExtended.go  | 15 +++------
 .../readwrite/model/CALDataRequestGetStatus.go     | 11 ++-----
 .../cbus/readwrite/model/CALDataRequestIdentify.go |  9 +----
 .../cbus/readwrite/model/CALDataRequestRecall.go   | 11 ++-----
 .../cbus/readwrite/model/CALDataRequestReset.go    |  7 ----
 .../plc4go/cbus/readwrite/model/CALReply.go        |  4 +--
 .../plc4go/cbus/readwrite/model/CALReplyLong.go    | 14 ++++----
 .../plc4go/cbus/readwrite/model/CALReplyReply.go   |  2 +-
 .../plc4go/cbus/readwrite/model/CBusCommand.go     |  6 ++--
 .../model/CBusCommandPointToMultiPoint.go          |  9 +----
 .../readwrite/model/CBusCommandPointToPoint.go     |  9 +----
 .../model/CBusCommandPointToPointToMultiPoint.go   |  9 +----
 .../CBusCommandPointToPointToMultiPointNormal.go   | 10 +++---
 .../CBusCommandPointToPointToMultiPointStatus.go   |  8 ++---
 .../plc4go/cbus/readwrite/model/CBusHeader.go      |  4 +--
 .../plc4go/cbus/readwrite/model/CBusOptions.go     | 16 ++++-----
 .../model/CBusPointToMultiPointCommand.go          |  2 +-
 .../model/CBusPointToMultiPointCommandNormal.go    | 10 +++---
 .../model/CBusPointToMultiPointCommandStatus.go    |  8 ++---
 .../readwrite/model/CBusPointToPointCommand.go     | 14 ++++----
 .../model/CBusPointToPointCommandDirect.go         |  9 +----
 .../model/CBusPointToPointCommandIndirect.go       | 13 ++------
 .../model/CBusPointToPointToMultipointCommand.go   |  6 ++--
 .../plc4go/cbus/readwrite/model/Checksum.go        |  2 +-
 .../plc4go/cbus/readwrite/model/CommandHeader.go   |  2 +-
 .../plc4go/cbus/readwrite/model/Confirmation.go    |  8 ++---
 .../cbus/readwrite/model/ConfirmationReply.go      |  2 +-
 .../cbus/readwrite/model/ExclamationMarkReply.go   |  2 +-
 .../readwrite/model/ExtendedFormatStatusReply.go   | 12 +++----
 .../cbus/readwrite/model/ExtendedStatusHeader.go   |  2 +-
 .../cbus/readwrite/model/IdentifyReplyCommand.go   |  4 +--
 .../model/IdentifyReplyCommandDSIStatus.go         | 20 ++++++------
 ...dentifyReplyCommandExtendedDiagnosticSummary.go | 38 +++++++++++-----------
 .../model/IdentifyReplyCommandFirmwareSummary.go   |  6 ++--
 .../model/IdentifyReplyCommandFirmwareVersion.go   |  2 +-
 .../IdentifyReplyCommandGAVPhysicalAddresses.go    |  2 +-
 .../model/IdentifyReplyCommandGAVValuesCurrent.go  |  2 +-
 .../model/IdentifyReplyCommandGAVValuesStored.go   |  2 +-
 .../model/IdentifyReplyCommandManufacturer.go      |  2 +-
 .../model/IdentifyReplyCommandNetworkVoltage.go    |  4 +--
 .../readwrite/model/IdentifyReplyCommandType.go    |  2 +-
 .../plc4go/cbus/readwrite/model/MonitoredSAL.go    |  4 +--
 .../model/MonitoredSALLongFormSmartMode.go         | 14 ++++----
 .../cbus/readwrite/model/MonitoredSALReply.go      |  2 +-
 .../model/MonitoredSALShortFormBasicMode.go        | 10 +++---
 .../plc4go/cbus/readwrite/model/NetworkNumber.go   |  2 +-
 .../model/NetworkProtocolControlInformation.go     |  4 +--
 .../plc4go/cbus/readwrite/model/NetworkRoute.go    |  4 +--
 .../cbus/readwrite/model/ParameterChangeReply.go   |  2 +-
 .../plc4go/cbus/readwrite/model/PowerUpReply.go    |  2 +-
 .../internal/plc4go/cbus/readwrite/model/Reply.go  |  2 +-
 .../plc4go/cbus/readwrite/model/ReplyNetwork.go    |  6 ++--
 .../plc4go/cbus/readwrite/model/SALData.go         |  6 ++--
 .../plc4go/cbus/readwrite/model/SALDataOff.go      |  9 +----
 .../plc4go/cbus/readwrite/model/SALDataOn.go       |  9 +----
 .../cbus/readwrite/model/SALDataRampToLevel.go     | 11 ++-----
 .../cbus/readwrite/model/SALDataTerminateRamp.go   |  9 +----
 .../cbus/readwrite/model/SerialInterfaceAddress.go |  2 +-
 .../readwrite/model/StandardFormatStatusReply.go   | 10 +++---
 .../plc4go/cbus/readwrite/model/StatusByte.go      |  8 ++---
 .../plc4go/cbus/readwrite/model/StatusHeader.go    |  2 +-
 .../plc4go/cbus/readwrite/model/StatusRequest.go   |  2 +-
 .../readwrite/model/StatusRequestBinaryState.go    |  2 +-
 .../cbus/readwrite/model/StatusRequestLevel.go     |  4 +--
 .../plc4go/cbus/readwrite/model/UnitAddress.go     |  2 +-
 .../plc4go/df1/readwrite/model/DF1Command.go       | 10 +++---
 .../plc4go/df1/readwrite/model/DF1Symbol.go        |  6 ++--
 .../df1/readwrite/model/DF1SymbolMessageFrame.go   |  6 ++--
 .../readwrite/model/DF1UnprotectedReadRequest.go   |  4 +--
 .../readwrite/model/DF1UnprotectedReadResponse.go  |  2 +-
 .../plc4go/eip/readwrite/model/CipExchange.go      |  2 +-
 .../plc4go/eip/readwrite/model/CipRRData.go        |  2 +-
 .../plc4go/eip/readwrite/model/CipReadRequest.go   |  6 ++--
 .../plc4go/eip/readwrite/model/CipReadResponse.go  |  8 ++---
 .../plc4go/eip/readwrite/model/CipService.go       |  6 ++--
 .../eip/readwrite/model/CipUnconnectedRequest.go   |  6 ++--
 .../plc4go/eip/readwrite/model/CipWriteRequest.go  | 10 +++---
 .../plc4go/eip/readwrite/model/CipWriteResponse.go |  4 +--
 .../plc4go/eip/readwrite/model/EipPacket.go        | 14 ++++----
 .../eip/readwrite/model/MultipleServiceRequest.go  |  2 +-
 .../eip/readwrite/model/MultipleServiceResponse.go | 10 +++---
 .../plc4go/eip/readwrite/model/Services.go         |  6 ++--
 .../firmata/readwrite/model/FirmataCommand.go      |  6 ++--
 .../model/FirmataCommandProtocolVersion.go         |  4 +--
 .../model/FirmataCommandSetDigitalPinValue.go      |  4 +--
 .../readwrite/model/FirmataCommandSetPinMode.go    |  4 +--
 .../firmata/readwrite/model/FirmataCommandSysex.go |  2 +-
 .../firmata/readwrite/model/FirmataMessage.go      |  6 ++--
 .../readwrite/model/FirmataMessageAnalogIO.go      |  4 +--
 .../readwrite/model/FirmataMessageCommand.go       |  2 +-
 .../readwrite/model/FirmataMessageDigitalIO.go     |  4 +--
 .../model/FirmataMessageSubscribeAnalogPinValue.go |  4 +--
 .../FirmataMessageSubscribeDigitalPinValue.go      |  4 +--
 .../plc4go/firmata/readwrite/model/SysexCommand.go | 10 +++---
 .../SysexCommandAnalogMappingQueryResponse.go      |  2 +-
 .../readwrite/model/SysexCommandExtendedId.go      |  2 +-
 .../readwrite/model/SysexCommandPinStateQuery.go   |  2 +-
 .../model/SysexCommandPinStateResponse.go          |  6 ++--
 .../model/SysexCommandReportFirmwareResponse.go    |  6 ++--
 .../plc4go/knxnetip/readwrite/model/Apdu.go        | 10 +++---
 .../plc4go/knxnetip/readwrite/model/ApduControl.go |  6 ++--
 .../readwrite/model/ApduControlContainer.go        |  2 +-
 .../plc4go/knxnetip/readwrite/model/ApduData.go    |  6 ++--
 .../knxnetip/readwrite/model/ApduDataContainer.go  |  2 +-
 .../model/ApduDataDeviceDescriptorRead.go          |  2 +-
 .../model/ApduDataDeviceDescriptorResponse.go      |  4 +--
 .../plc4go/knxnetip/readwrite/model/ApduDataExt.go |  6 ++--
 .../readwrite/model/ApduDataExtAuthorizeRequest.go |  4 +--
 .../model/ApduDataExtAuthorizeResponse.go          |  2 +-
 .../model/ApduDataExtPropertyDescriptionRead.go    |  6 ++--
 .../ApduDataExtPropertyDescriptionResponse.go      | 16 ++++-----
 .../model/ApduDataExtPropertyValueRead.go          |  8 ++---
 .../model/ApduDataExtPropertyValueResponse.go      | 10 +++---
 .../model/ApduDataExtPropertyValueWrite.go         | 10 +++---
 .../readwrite/model/ApduDataGroupValueResponse.go  |  4 +--
 .../readwrite/model/ApduDataGroupValueWrite.go     |  4 +--
 .../knxnetip/readwrite/model/ApduDataMemoryRead.go |  4 +--
 .../readwrite/model/ApduDataMemoryResponse.go      |  4 +--
 .../knxnetip/readwrite/model/ApduDataOther.go      |  2 +-
 .../plc4go/knxnetip/readwrite/model/CEMI.go        |  6 ++--
 .../readwrite/model/CEMIAdditionalInformation.go   |  6 ++--
 .../CEMIAdditionalInformationBusmonitorInfo.go     | 12 +++----
 .../CEMIAdditionalInformationRelativeTimestamp.go  |  2 +-
 .../knxnetip/readwrite/model/ChannelInformation.go |  4 +--
 .../knxnetip/readwrite/model/ComObjectTable.go     |  4 +--
 .../model/ComObjectTableRealisationType1.go        |  6 ++--
 .../model/ComObjectTableRealisationType2.go        |  6 ++--
 .../model/ComObjectTableRealisationType6.go        |  2 +-
 .../knxnetip/readwrite/model/ConnectionRequest.go  |  6 ++--
 .../model/ConnectionRequestInformation.go          |  6 ++--
 ...ConnectionRequestInformationTunnelConnection.go |  2 +-
 .../knxnetip/readwrite/model/ConnectionResponse.go |  8 ++---
 .../readwrite/model/ConnectionResponseDataBlock.go |  6 ++--
 .../ConnectionResponseDataBlockTunnelConnection.go |  2 +-
 .../readwrite/model/ConnectionStateRequest.go      |  4 +--
 .../readwrite/model/ConnectionStateResponse.go     |  4 +--
 .../knxnetip/readwrite/model/DIBDeviceInfo.go      | 18 +++++-----
 .../knxnetip/readwrite/model/DIBSuppSvcFamilies.go |  4 +--
 .../knxnetip/readwrite/model/DescriptionRequest.go |  2 +-
 .../readwrite/model/DescriptionResponse.go         |  4 +--
 .../readwrite/model/DeviceConfigurationAck.go      |  2 +-
 .../model/DeviceConfigurationAckDataBlock.go       |  6 ++--
 .../readwrite/model/DeviceConfigurationRequest.go  |  4 +--
 .../model/DeviceConfigurationRequestDataBlock.go   |  4 +--
 .../readwrite/model/DeviceDescriptorType2.go       | 20 ++++++------
 .../knxnetip/readwrite/model/DeviceStatus.go       |  2 +-
 .../knxnetip/readwrite/model/DisconnectRequest.go  |  4 +--
 .../knxnetip/readwrite/model/DisconnectResponse.go |  4 +--
 .../model/GroupObjectDescriptorRealisationType1.go | 16 ++++-----
 .../model/GroupObjectDescriptorRealisationType2.go | 18 +++++-----
 .../model/GroupObjectDescriptorRealisationType7.go | 18 +++++-----
 .../model/GroupObjectDescriptorRealisationTypeB.go | 16 ++++-----
 .../readwrite/model/HPAIControlEndpoint.go         |  6 ++--
 .../knxnetip/readwrite/model/HPAIDataEndpoint.go   |  6 ++--
 .../readwrite/model/HPAIDiscoveryEndpoint.go       |  6 ++--
 .../plc4go/knxnetip/readwrite/model/IPAddress.go   |  2 +-
 .../plc4go/knxnetip/readwrite/model/KnxAddress.go  |  6 ++--
 .../knxnetip/readwrite/model/KnxGroupAddress.go    |  4 +--
 .../readwrite/model/KnxGroupAddress2Level.go       |  4 +--
 .../readwrite/model/KnxGroupAddress3Level.go       |  6 ++--
 .../readwrite/model/KnxGroupAddressFreeLevel.go    |  2 +-
 .../knxnetip/readwrite/model/KnxNetIpCore.go       |  2 +-
 .../readwrite/model/KnxNetIpDeviceManagement.go    |  2 +-
 .../knxnetip/readwrite/model/KnxNetIpMessage.go    |  6 ++--
 .../knxnetip/readwrite/model/KnxNetIpRouting.go    |  2 +-
 .../knxnetip/readwrite/model/KnxNetIpTunneling.go  |  2 +-
 .../knxnetip/readwrite/model/KnxNetObjectServer.go |  2 +-
 .../model/KnxNetRemoteConfigurationAndDiagnosis.go |  2 +-
 .../readwrite/model/KnxNetRemoteLogging.go         |  2 +-
 .../plc4go/knxnetip/readwrite/model/LBusmonInd.go  | 10 +++---
 .../plc4go/knxnetip/readwrite/model/LDataCon.go    |  6 ++--
 .../knxnetip/readwrite/model/LDataExtended.go      | 12 +++----
 .../plc4go/knxnetip/readwrite/model/LDataFrame.go  | 22 ++++++-------
 .../plc4go/knxnetip/readwrite/model/LDataInd.go    |  6 ++--
 .../plc4go/knxnetip/readwrite/model/LDataReq.go    |  6 ++--
 .../plc4go/knxnetip/readwrite/model/LPollData.go   |  6 ++--
 .../plc4go/knxnetip/readwrite/model/MACAddress.go  |  2 +-
 .../knxnetip/readwrite/model/MPropReadCon.go       | 12 +++----
 .../knxnetip/readwrite/model/MPropReadReq.go       | 10 +++---
 .../model/ProjectInstallationIdentifier.go         |  4 +--
 .../knxnetip/readwrite/model/RelativeTimestamp.go  |  2 +-
 .../knxnetip/readwrite/model/SearchRequest.go      |  2 +-
 .../knxnetip/readwrite/model/SearchResponse.go     |  6 ++--
 .../plc4go/knxnetip/readwrite/model/ServiceId.go   |  6 ++--
 .../knxnetip/readwrite/model/TunnelingRequest.go   |  4 +--
 .../readwrite/model/TunnelingRequestDataBlock.go   |  4 +--
 .../knxnetip/readwrite/model/TunnelingResponse.go  |  2 +-
 .../readwrite/model/TunnelingResponseDataBlock.go  |  6 ++--
 .../knxnetip/readwrite/model/UnknownMessage.go     |  2 +-
 .../model/ModbusDeviceInformationObject.go         |  4 +--
 .../plc4go/modbus/readwrite/model/ModbusPDU.go     | 16 ++++-----
 .../readwrite/model/ModbusPDUDiagnosticRequest.go  |  4 +--
 .../readwrite/model/ModbusPDUDiagnosticResponse.go |  4 +--
 .../modbus/readwrite/model/ModbusPDUError.go       |  2 +-
 .../model/ModbusPDUGetComEventCounterResponse.go   |  4 +--
 .../model/ModbusPDUGetComEventLogResponse.go       |  8 ++---
 .../ModbusPDUMaskWriteHoldingRegisterRequest.go    |  6 ++--
 .../ModbusPDUMaskWriteHoldingRegisterResponse.go   |  6 ++--
 .../readwrite/model/ModbusPDUReadCoilsRequest.go   |  4 +--
 .../readwrite/model/ModbusPDUReadCoilsResponse.go  |  2 +-
 .../ModbusPDUReadDeviceIdentificationRequest.go    |  4 +--
 .../ModbusPDUReadDeviceIdentificationResponse.go   | 12 +++----
 .../model/ModbusPDUReadDiscreteInputsRequest.go    |  4 +--
 .../model/ModbusPDUReadDiscreteInputsResponse.go   |  2 +-
 .../model/ModbusPDUReadExceptionStatusResponse.go  |  2 +-
 .../model/ModbusPDUReadFifoQueueRequest.go         |  2 +-
 .../model/ModbusPDUReadFifoQueueResponse.go        |  2 +-
 .../model/ModbusPDUReadFileRecordRequest.go        |  2 +-
 .../model/ModbusPDUReadFileRecordRequestItem.go    |  8 ++---
 .../model/ModbusPDUReadFileRecordResponse.go       |  2 +-
 .../model/ModbusPDUReadFileRecordResponseItem.go   |  4 +--
 .../model/ModbusPDUReadHoldingRegistersRequest.go  |  4 +--
 .../model/ModbusPDUReadHoldingRegistersResponse.go |  2 +-
 .../model/ModbusPDUReadInputRegistersRequest.go    |  4 +--
 .../model/ModbusPDUReadInputRegistersResponse.go   |  2 +-
 ...sPDUReadWriteMultipleHoldingRegistersRequest.go | 10 +++---
 ...PDUReadWriteMultipleHoldingRegistersResponse.go |  2 +-
 .../model/ModbusPDUReportServerIdResponse.go       |  2 +-
 .../model/ModbusPDUWriteFileRecordRequest.go       |  2 +-
 .../model/ModbusPDUWriteFileRecordRequestItem.go   |  8 ++---
 .../model/ModbusPDUWriteFileRecordResponse.go      |  2 +-
 .../model/ModbusPDUWriteFileRecordResponseItem.go  |  8 ++---
 .../model/ModbusPDUWriteMultipleCoilsRequest.go    |  6 ++--
 .../model/ModbusPDUWriteMultipleCoilsResponse.go   |  4 +--
 ...odbusPDUWriteMultipleHoldingRegistersRequest.go |  6 ++--
 ...dbusPDUWriteMultipleHoldingRegistersResponse.go |  4 +--
 .../model/ModbusPDUWriteSingleCoilRequest.go       |  4 +--
 .../model/ModbusPDUWriteSingleCoilResponse.go      |  4 +--
 .../model/ModbusPDUWriteSingleRegisterRequest.go   |  4 +--
 .../model/ModbusPDUWriteSingleRegisterResponse.go  |  4 +--
 .../modbus/readwrite/model/ModbusSerialADU.go      |  4 +--
 .../plc4go/modbus/readwrite/model/ModbusTcpADU.go  |  6 ++--
 .../model/AlarmMessageAckObjectPushType.go         | 12 +++----
 .../s7/readwrite/model/AlarmMessageAckPushType.go  |  8 ++---
 .../readwrite/model/AlarmMessageAckResponseType.go |  6 ++--
 .../s7/readwrite/model/AlarmMessageAckType.go      |  6 ++--
 .../readwrite/model/AlarmMessageObjectAckType.go   | 10 +++---
 .../readwrite/model/AlarmMessageObjectPushType.go  | 18 +++++-----
 .../readwrite/model/AlarmMessageObjectQueryType.go | 16 ++++-----
 .../s7/readwrite/model/AlarmMessagePushType.go     |  8 ++---
 .../s7/readwrite/model/AlarmMessageQueryType.go    | 10 +++---
 .../s7/readwrite/model/AssociatedValueType.go      |  8 ++---
 .../plc4go/s7/readwrite/model/COTPPacket.go        | 10 +++---
 .../readwrite/model/COTPPacketConnectionRequest.go |  6 ++--
 .../model/COTPPacketConnectionResponse.go          |  6 ++--
 .../plc4go/s7/readwrite/model/COTPPacketData.go    |  4 +--
 .../readwrite/model/COTPPacketDisconnectRequest.go |  6 ++--
 .../model/COTPPacketDisconnectResponse.go          |  4 +--
 .../s7/readwrite/model/COTPPacketTpduError.go      |  4 +--
 .../plc4go/s7/readwrite/model/COTPParameter.go     |  6 ++--
 .../s7/readwrite/model/COTPParameterCalledTsap.go  |  2 +-
 .../s7/readwrite/model/COTPParameterCallingTsap.go |  2 +-
 .../s7/readwrite/model/COTPParameterChecksum.go    |  2 +-
 ...COTPParameterDisconnectAdditionalInformation.go |  2 +-
 .../s7/readwrite/model/COTPParameterTpduSize.go    |  2 +-
 .../plc4go/s7/readwrite/model/DateAndTime.go       | 16 ++++-----
 .../plc4go/s7/readwrite/model/S7Address.go         |  6 ++--
 .../plc4go/s7/readwrite/model/S7AddressAny.go      | 12 +++----
 .../s7/readwrite/model/S7DataAlarmMessage.go       |  4 +--
 .../plc4go/s7/readwrite/model/S7Message.go         | 12 +++----
 .../s7/readwrite/model/S7MessageObjectRequest.go   |  6 ++--
 .../s7/readwrite/model/S7MessageObjectResponse.go  |  4 +--
 .../plc4go/s7/readwrite/model/S7MessageResponse.go |  4 +--
 .../s7/readwrite/model/S7MessageResponseData.go    |  4 +--
 .../plc4go/s7/readwrite/model/S7Parameter.go       | 10 +++---
 .../readwrite/model/S7ParameterModeTransition.go   | 10 +++---
 .../readwrite/model/S7ParameterReadVarRequest.go   |  2 +-
 .../readwrite/model/S7ParameterReadVarResponse.go  |  2 +-
 .../model/S7ParameterSetupCommunication.go         |  6 ++--
 .../s7/readwrite/model/S7ParameterUserData.go      |  2 +-
 .../s7/readwrite/model/S7ParameterUserDataItem.go  |  6 ++--
 .../model/S7ParameterUserDataItemCPUFunctions.go   | 16 ++++-----
 .../readwrite/model/S7ParameterWriteVarRequest.go  |  2 +-
 .../readwrite/model/S7ParameterWriteVarResponse.go |  2 +-
 .../plc4go/s7/readwrite/model/S7Payload.go         | 16 ++++-----
 .../plc4go/s7/readwrite/model/S7PayloadAlarm8.go   |  2 +-
 .../s7/readwrite/model/S7PayloadAlarmAckInd.go     |  2 +-
 .../plc4go/s7/readwrite/model/S7PayloadAlarmS.go   |  2 +-
 .../plc4go/s7/readwrite/model/S7PayloadAlarmSC.go  |  2 +-
 .../plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go  |  2 +-
 .../readwrite/model/S7PayloadDiagnosticMessage.go  | 14 ++++----
 .../plc4go/s7/readwrite/model/S7PayloadNotify.go   |  2 +-
 .../plc4go/s7/readwrite/model/S7PayloadNotify8.go  |  2 +-
 .../s7/readwrite/model/S7PayloadReadVarResponse.go |  2 +-
 .../plc4go/s7/readwrite/model/S7PayloadUserData.go |  2 +-
 .../s7/readwrite/model/S7PayloadUserDataItem.go    | 16 ++++-----
 .../S7PayloadUserDataItemCpuFunctionAlarmAck.go    |  4 +--
 ...yloadUserDataItemCpuFunctionAlarmAckResponse.go |  4 +--
 .../S7PayloadUserDataItemCpuFunctionAlarmQuery.go  |  6 ++--
 ...oadUserDataItemCpuFunctionAlarmQueryResponse.go |  4 +--
 ...ayloadUserDataItemCpuFunctionMsgSubscription.go |  8 ++---
 ...aItemCpuFunctionMsgSubscriptionAlarmResponse.go | 10 +++---
 ...ataItemCpuFunctionMsgSubscriptionSysResponse.go |  4 +--
 ...PayloadUserDataItemCpuFunctionReadSzlRequest.go |  4 +--
 ...ayloadUserDataItemCpuFunctionReadSzlResponse.go |  6 ++--
 .../s7/readwrite/model/S7PayloadWriteVarRequest.go |  2 +-
 .../readwrite/model/S7PayloadWriteVarResponse.go   |  2 +-
 .../s7/readwrite/model/S7VarPayloadDataItem.go     |  6 ++--
 .../s7/readwrite/model/S7VarPayloadStatusItem.go   |  2 +-
 .../readwrite/model/S7VarRequestParameterItem.go   |  6 ++--
 .../model/S7VarRequestParameterItemAddress.go      |  2 +-
 plc4go/internal/plc4go/s7/readwrite/model/State.go | 16 ++++-----
 .../plc4go/s7/readwrite/model/SzlDataTreeItem.go   | 10 +++---
 plc4go/internal/plc4go/s7/readwrite/model/SzlId.go |  6 ++--
 .../plc4go/s7/readwrite/model/TPKTPacket.go        |  2 +-
 .../plc4go/simulated/readwrite/model/Dummy.go      |  2 +-
 505 files changed, 1522 insertions(+), 1943 deletions(-)

diff --git a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
index 731322a..58df6ea 100644
--- a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
+++ b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
@@ -791,7 +791,7 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
                         .filter(curField -> (curField instanceof DiscriminatorField) && ((DiscriminatorField) curField).getName().equals(childProperty))
                         .findFirst();
                     if (matchingDiscriminatorField.isPresent()) {
-                        return tracer + "Cast" + getLanguageTypeNameForTypeReference(nonSimpleTypeReference) + "(" + variableLiteralName + ").Child." + capitalize(childProperty) + "()";
+                        return tracer + "Cast" + getLanguageTypeNameForTypeReference(nonSimpleTypeReference) + "(" + variableLiteralName + ").Child.Get" + capitalize(childProperty) + "()";
                     }
                     // TODO: is this really meant to fall through?
                     tracer = tracer.dive("we fell through the complex complex");
diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
index 8ffe7f1..cdf110c 100644
--- a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -115,19 +115,19 @@ type I${type.name} interface {
 	<#list helper.getDiscriminatorTypes() as discriminatorName, discriminatorType>
 	<#-- If the discriminator name matches that of another field, suppress the methods generation -->
 		<#if !type.isNonDiscriminatorField(discriminatorName)>
-	// ${discriminatorName?cap_first} returns ${discriminatorName?cap_first}
-	${discriminatorName?cap_first}() <#if discriminatorType?has_content && discriminatorType.isNonSimpleTypeReference() && !discriminatorType.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(discriminatorType)}
+	// Get${discriminatorName?cap_first} returns ${discriminatorName?cap_first} (discriminator field)
+	Get${discriminatorName?cap_first}() <#if discriminatorType?has_content && discriminatorType.isNonSimpleTypeReference() && !discriminatorType.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(discriminatorType)}
 		</#if>
 	</#list>
 </#if>
 <#list type.propertyFields as field>
     <#assign typeRef=field.asTypedField().orElseThrow().type>
-	// Get${field.name?cap_first} returns ${field.name?cap_first}
+	// Get${field.name?cap_first} returns ${field.name?cap_first} (property field)
 	Get${field.name?cap_first}() <#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)}
 </#list>
 <#list type.virtualFields as field>
     <#assign typeRef=field.asTypedField().orElseThrow().type>
-	// Get${field.name?cap_first} returns ${field.name?cap_first}
+	// Get${field.name?cap_first} returns ${field.name?cap_first} (virtual field)
 	Get${field.name?cap_first}() <#if helper.needsPointerAccess(field)>*</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)}
 </#list>
 	// GetLengthInBytes returns the length in bytes
@@ -225,14 +225,6 @@ type I${type.name}Child interface {
 	GetTypeName() string
 	I${type.name}
 }
-	<#--list helper.getDiscriminatorTypes() as discriminatorName, discriminatorType>
-	<#- If the discriminator name matches that of another field, suppress the methods generation ->
-		<#if !helper.isNonDiscriminatorField(discriminatorName)>
-func ${type.name}${discriminatorName?cap_first}(m I${type.name}) ${helper.getLanguageTypeNameForTypeReference(helper.getDiscriminatorTypes()[discriminatorName])} {
-	return m.${discriminatorName?cap_first}()
-}
-		</#if>
-	</#list-->
 <#elseif type.parentType.isPresent()>
 
 <@compress single_line=true>
@@ -1551,7 +1543,7 @@ func (m *${type.name}) Serialize(writeBuffer utils.WriteBuffer) error {
 					<#assign discriminatorField = field.asDiscriminatorField().orElseThrow()>
 
 	// Discriminator Field (${discriminatorField.name}) (Used as input to a switch field)
-	${discriminatorField.name} := ${helper.getLanguageTypeNameForField(field)}(child.${discriminatorField.name?cap_first}())
+	${discriminatorField.name} := ${helper.getLanguageTypeNameForField(field)}(child.Get${discriminatorField.name?cap_first}())
 					<#if helper.isEnumField(field)>
 	_${discriminatorField.name}Err := ${discriminatorField.name}.Serialize(writeBuffer)
 					<#else>
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go
index 71123ef..d1ad22f 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go
@@ -38,15 +38,15 @@ type CIPEncapsulationPacket struct {
 
 // The corresponding interface
 type ICIPEncapsulationPacket interface {
-	// CommandType returns CommandType
-	CommandType() uint16
-	// GetSessionHandle returns SessionHandle
+	// GetCommandType returns CommandType (discriminator field)
+	GetCommandType() uint16
+	// GetSessionHandle returns SessionHandle (property field)
 	GetSessionHandle() uint32
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint32
-	// GetSenderContext returns SenderContext
+	// GetSenderContext returns SenderContext (property field)
 	GetSenderContext() []uint8
-	// GetOptions returns Options
+	// GetOptions returns Options (property field)
 	GetOptions() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -263,7 +263,7 @@ func (m *CIPEncapsulationPacket) SerializeParent(writeBuffer utils.WriteBuffer,
 	}
 
 	// Discriminator Field (commandType) (Used as input to a switch field)
-	commandType := uint16(child.CommandType())
+	commandType := uint16(child.GetCommandType())
 	_commandTypeErr := writeBuffer.WriteUint16("commandType", 16, (commandType))
 
 	if _commandTypeErr != nil {
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
index de16fa9..9e48305 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
@@ -35,7 +35,7 @@ type CIPEncapsulationReadRequest struct {
 // The corresponding interface
 type ICIPEncapsulationReadRequest interface {
 	ICIPEncapsulationPacket
-	// GetRequest returns Request
+	// GetRequest returns Request (property field)
 	GetRequest() *DF1RequestMessage
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
index 49683a2..b712dc8 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
@@ -38,7 +38,7 @@ type CIPEncapsulationReadResponse struct {
 // The corresponding interface
 type ICIPEncapsulationReadResponse interface {
 	ICIPEncapsulationPacket
-	// GetResponse returns Response
+	// GetResponse returns Response (property field)
 	GetResponse() *DF1ResponseMessage
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
index 413d084..7d6e119 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
@@ -35,7 +35,7 @@ type DF1CommandRequestMessage struct {
 // The corresponding interface
 type IDF1CommandRequestMessage interface {
 	IDF1RequestMessage
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *DF1RequestCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index 5e9fc27..9cef393 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -38,7 +38,7 @@ type DF1CommandResponseMessageProtectedTypedLogicalRead struct {
 // The corresponding interface
 type IDF1CommandResponseMessageProtectedTypedLogicalRead interface {
 	IDF1ResponseMessage
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go
index 8417d52..9a3c344 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestCommand.go
@@ -33,8 +33,8 @@ type DF1RequestCommand struct {
 
 // The corresponding interface
 type IDF1RequestCommand interface {
-	// FunctionCode returns FunctionCode
-	FunctionCode() uint8
+	// GetFunctionCode returns FunctionCode (discriminator field)
+	GetFunctionCode() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -148,7 +148,7 @@ func (m *DF1RequestCommand) SerializeParent(writeBuffer utils.WriteBuffer, child
 	}
 
 	// Discriminator Field (functionCode) (Used as input to a switch field)
-	functionCode := uint8(child.FunctionCode())
+	functionCode := uint8(child.GetFunctionCode())
 	_functionCodeErr := writeBuffer.WriteUint8("functionCode", 8, (functionCode))
 
 	if _functionCodeErr != nil {
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go
index 1a6c34b..e4e7729 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestMessage.go
@@ -38,15 +38,15 @@ type DF1RequestMessage struct {
 
 // The corresponding interface
 type IDF1RequestMessage interface {
-	// CommandCode returns CommandCode
-	CommandCode() uint8
-	// GetDestinationAddress returns DestinationAddress
+	// GetCommandCode returns CommandCode (discriminator field)
+	GetCommandCode() uint8
+	// GetDestinationAddress returns DestinationAddress (property field)
 	GetDestinationAddress() uint8
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetTransactionCounter returns TransactionCounter
+	// GetTransactionCounter returns TransactionCounter (property field)
 	GetTransactionCounter() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -255,7 +255,7 @@ func (m *DF1RequestMessage) SerializeParent(writeBuffer utils.WriteBuffer, child
 	}
 
 	// Discriminator Field (commandCode) (Used as input to a switch field)
-	commandCode := uint8(child.CommandCode())
+	commandCode := uint8(child.GetCommandCode())
 	_commandCodeErr := writeBuffer.WriteUint8("commandCode", 8, (commandCode))
 
 	if _commandCodeErr != nil {
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
index 5f2a3be..3ef6bea 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
@@ -39,15 +39,15 @@ type DF1RequestProtectedTypedLogicalRead struct {
 // The corresponding interface
 type IDF1RequestProtectedTypedLogicalRead interface {
 	IDF1RequestCommand
-	// GetByteSize returns ByteSize
+	// GetByteSize returns ByteSize (property field)
 	GetByteSize() uint8
-	// GetFileNumber returns FileNumber
+	// GetFileNumber returns FileNumber (property field)
 	GetFileNumber() uint8
-	// GetFileType returns FileType
+	// GetFileType returns FileType (property field)
 	GetFileType() uint8
-	// GetElementNumber returns ElementNumber
+	// GetElementNumber returns ElementNumber (property field)
 	GetElementNumber() uint8
-	// GetSubElementNumber returns SubElementNumber
+	// GetSubElementNumber returns SubElementNumber (property field)
 	GetSubElementNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
index 06e3fcb..42ac43e 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
@@ -41,15 +41,15 @@ type DF1ResponseMessage struct {
 
 // The corresponding interface
 type IDF1ResponseMessage interface {
-	// CommandCode returns CommandCode
-	CommandCode() uint8
-	// GetDestinationAddress returns DestinationAddress
+	// GetCommandCode returns CommandCode (discriminator field)
+	GetCommandCode() uint8
+	// GetDestinationAddress returns DestinationAddress (property field)
 	GetDestinationAddress() uint8
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetTransactionCounter returns TransactionCounter
+	// GetTransactionCounter returns TransactionCounter (property field)
 	GetTransactionCounter() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -283,7 +283,7 @@ func (m *DF1ResponseMessage) SerializeParent(writeBuffer utils.WriteBuffer, chil
 	}
 
 	// Discriminator Field (commandCode) (Used as input to a switch field)
-	commandCode := uint8(child.CommandCode())
+	commandCode := uint8(child.GetCommandCode())
 	_commandCodeErr := writeBuffer.WriteUint8("commandCode", 8, (commandCode))
 
 	if _commandCodeErr != nil {
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
index bd83e0e..825b55f 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
@@ -41,17 +41,17 @@ type AdsAddDeviceNotificationRequest struct {
 // The corresponding interface
 type IAdsAddDeviceNotificationRequest interface {
 	IAdsData
-	// GetIndexGroup returns IndexGroup
+	// GetIndexGroup returns IndexGroup (property field)
 	GetIndexGroup() uint32
-	// GetIndexOffset returns IndexOffset
+	// GetIndexOffset returns IndexOffset (property field)
 	GetIndexOffset() uint32
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() uint32
-	// GetTransmissionMode returns TransmissionMode
+	// GetTransmissionMode returns TransmissionMode (property field)
 	GetTransmissionMode() uint32
-	// GetMaxDelay returns MaxDelay
+	// GetMaxDelay returns MaxDelay (property field)
 	GetMaxDelay() uint32
-	// GetCycleTime returns CycleTime
+	// GetCycleTime returns CycleTime (property field)
 	GetCycleTime() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
index bf3487b..a213000 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
@@ -36,9 +36,9 @@ type AdsAddDeviceNotificationResponse struct {
 // The corresponding interface
 type IAdsAddDeviceNotificationResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
-	// GetNotificationHandle returns NotificationHandle
+	// GetNotificationHandle returns NotificationHandle (property field)
 	GetNotificationHandle() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
index c843542..406f584 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
@@ -33,10 +33,10 @@ type AdsData struct {
 
 // The corresponding interface
 type IAdsData interface {
-	// CommandId returns CommandId
-	CommandId() CommandId
-	// Response returns Response
-	Response() bool
+	// GetCommandId returns CommandId (discriminator field)
+	GetCommandId() CommandId
+	// GetResponse returns Response (discriminator field)
+	GetResponse() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
index 30f3499..640dab4 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
@@ -35,7 +35,7 @@ type AdsDeleteDeviceNotificationRequest struct {
 // The corresponding interface
 type IAdsDeleteDeviceNotificationRequest interface {
 	IAdsData
-	// GetNotificationHandle returns NotificationHandle
+	// GetNotificationHandle returns NotificationHandle (property field)
 	GetNotificationHandle() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
index 67a8f7a..130745e 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
@@ -35,7 +35,7 @@ type AdsDeleteDeviceNotificationResponse struct {
 // The corresponding interface
 type IAdsDeleteDeviceNotificationResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
index 3e956fb..1cfd2ac 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
@@ -37,11 +37,11 @@ type AdsDeviceNotificationRequest struct {
 // The corresponding interface
 type IAdsDeviceNotificationRequest interface {
 	IAdsData
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() uint32
-	// GetStamps returns Stamps
+	// GetStamps returns Stamps (property field)
 	GetStamps() uint32
-	// GetAdsStampHeaders returns AdsStampHeaders
+	// GetAdsStampHeaders returns AdsStampHeaders (property field)
 	GetAdsStampHeaders() []*AdsStampHeader
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
index 95ad449..0fda969 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
@@ -33,8 +33,8 @@ type AdsMultiRequestItem struct {
 
 // The corresponding interface
 type IAdsMultiRequestItem interface {
-	// IndexGroup returns IndexGroup
-	IndexGroup() uint32
+	// GetIndexGroup returns IndexGroup (discriminator field)
+	GetIndexGroup() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
index 4720e46..0ee6985 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
@@ -37,11 +37,11 @@ type AdsMultiRequestItemRead struct {
 // The corresponding interface
 type IAdsMultiRequestItemRead interface {
 	IAdsMultiRequestItem
-	// GetItemIndexGroup returns ItemIndexGroup
+	// GetItemIndexGroup returns ItemIndexGroup (property field)
 	GetItemIndexGroup() uint32
-	// GetItemIndexOffset returns ItemIndexOffset
+	// GetItemIndexOffset returns ItemIndexOffset (property field)
 	GetItemIndexOffset() uint32
-	// GetItemReadLength returns ItemReadLength
+	// GetItemReadLength returns ItemReadLength (property field)
 	GetItemReadLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
index 08b2a34..cb466c9 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
@@ -38,13 +38,13 @@ type AdsMultiRequestItemReadWrite struct {
 // The corresponding interface
 type IAdsMultiRequestItemReadWrite interface {
 	IAdsMultiRequestItem
-	// GetItemIndexGroup returns ItemIndexGroup
+	// GetItemIndexGroup returns ItemIndexGroup (property field)
 	GetItemIndexGroup() uint32
-	// GetItemIndexOffset returns ItemIndexOffset
+	// GetItemIndexOffset returns ItemIndexOffset (property field)
 	GetItemIndexOffset() uint32
-	// GetItemReadLength returns ItemReadLength
+	// GetItemReadLength returns ItemReadLength (property field)
 	GetItemReadLength() uint32
-	// GetItemWriteLength returns ItemWriteLength
+	// GetItemWriteLength returns ItemWriteLength (property field)
 	GetItemWriteLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
index 927a688..df7162c 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
@@ -37,11 +37,11 @@ type AdsMultiRequestItemWrite struct {
 // The corresponding interface
 type IAdsMultiRequestItemWrite interface {
 	IAdsMultiRequestItem
-	// GetItemIndexGroup returns ItemIndexGroup
+	// GetItemIndexGroup returns ItemIndexGroup (property field)
 	GetItemIndexGroup() uint32
-	// GetItemIndexOffset returns ItemIndexOffset
+	// GetItemIndexOffset returns ItemIndexOffset (property field)
 	GetItemIndexOffset() uint32
-	// GetItemWriteLength returns ItemWriteLength
+	// GetItemWriteLength returns ItemWriteLength (property field)
 	GetItemWriteLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
index bd70ddd..3c3e1ab 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsNotificationSample.go
@@ -35,11 +35,11 @@ type AdsNotificationSample struct {
 
 // The corresponding interface
 type IAdsNotificationSample interface {
-	// GetNotificationHandle returns NotificationHandle
+	// GetNotificationHandle returns NotificationHandle (property field)
 	GetNotificationHandle() uint32
-	// GetSampleSize returns SampleSize
+	// GetSampleSize returns SampleSize (property field)
 	GetSampleSize() uint32
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
index 86f4c7e..1b50f7e 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
@@ -39,15 +39,15 @@ type AdsReadDeviceInfoResponse struct {
 // The corresponding interface
 type IAdsReadDeviceInfoResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
-	// GetMajorVersion returns MajorVersion
+	// GetMajorVersion returns MajorVersion (property field)
 	GetMajorVersion() uint8
-	// GetMinorVersion returns MinorVersion
+	// GetMinorVersion returns MinorVersion (property field)
 	GetMinorVersion() uint8
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint16
-	// GetDevice returns Device
+	// GetDevice returns Device (property field)
 	GetDevice() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
index dfd9e9d..7c72243 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
@@ -37,11 +37,11 @@ type AdsReadRequest struct {
 // The corresponding interface
 type IAdsReadRequest interface {
 	IAdsData
-	// GetIndexGroup returns IndexGroup
+	// GetIndexGroup returns IndexGroup (property field)
 	GetIndexGroup() uint32
-	// GetIndexOffset returns IndexOffset
+	// GetIndexOffset returns IndexOffset (property field)
 	GetIndexOffset() uint32
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
index 2eea607..0b1121a 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
@@ -36,9 +36,9 @@ type AdsReadResponse struct {
 // The corresponding interface
 type IAdsReadResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
index b3105ac..cf6ff88 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
@@ -37,11 +37,11 @@ type AdsReadStateResponse struct {
 // The corresponding interface
 type IAdsReadStateResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
-	// GetAdsState returns AdsState
+	// GetAdsState returns AdsState (property field)
 	GetAdsState() uint16
-	// GetDeviceState returns DeviceState
+	// GetDeviceState returns DeviceState (property field)
 	GetDeviceState() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
index b6071fb..ab12767 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
@@ -39,15 +39,15 @@ type AdsReadWriteRequest struct {
 // The corresponding interface
 type IAdsReadWriteRequest interface {
 	IAdsData
-	// GetIndexGroup returns IndexGroup
+	// GetIndexGroup returns IndexGroup (property field)
 	GetIndexGroup() uint32
-	// GetIndexOffset returns IndexOffset
+	// GetIndexOffset returns IndexOffset (property field)
 	GetIndexOffset() uint32
-	// GetReadLength returns ReadLength
+	// GetReadLength returns ReadLength (property field)
 	GetReadLength() uint32
-	// GetItems returns Items
+	// GetItems returns Items (property field)
 	GetItems() []*AdsMultiRequestItem
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
index f8fee69..9dbc54e 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
@@ -36,9 +36,9 @@ type AdsReadWriteResponse struct {
 // The corresponding interface
 type IAdsReadWriteResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go
index baf65df..b31b7e1 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsStampHeader.go
@@ -35,11 +35,11 @@ type AdsStampHeader struct {
 
 // The corresponding interface
 type IAdsStampHeader interface {
-	// GetTimestamp returns Timestamp
+	// GetTimestamp returns Timestamp (property field)
 	GetTimestamp() uint64
-	// GetSamples returns Samples
+	// GetSamples returns Samples (property field)
 	GetSamples() uint32
-	// GetAdsNotificationSamples returns AdsNotificationSamples
+	// GetAdsNotificationSamples returns AdsNotificationSamples (property field)
 	GetAdsNotificationSamples() []*AdsNotificationSample
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
index abe99f1..83989d7 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
@@ -37,11 +37,11 @@ type AdsWriteControlRequest struct {
 // The corresponding interface
 type IAdsWriteControlRequest interface {
 	IAdsData
-	// GetAdsState returns AdsState
+	// GetAdsState returns AdsState (property field)
 	GetAdsState() uint16
-	// GetDeviceState returns DeviceState
+	// GetDeviceState returns DeviceState (property field)
 	GetDeviceState() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
index 78c95b9..5830916 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
@@ -35,7 +35,7 @@ type AdsWriteControlResponse struct {
 // The corresponding interface
 type IAdsWriteControlResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
index b22a5c7..45f4110 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
@@ -37,11 +37,11 @@ type AdsWriteRequest struct {
 // The corresponding interface
 type IAdsWriteRequest interface {
 	IAdsData
-	// GetIndexGroup returns IndexGroup
+	// GetIndexGroup returns IndexGroup (property field)
 	GetIndexGroup() uint32
-	// GetIndexOffset returns IndexOffset
+	// GetIndexOffset returns IndexOffset (property field)
 	GetIndexOffset() uint32
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
index 59225a2..5dde50e 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
@@ -35,7 +35,7 @@ type AdsWriteResponse struct {
 // The corresponding interface
 type IAdsWriteResponse interface {
 	IAdsData
-	// GetResult returns Result
+	// GetResult returns Result (property field)
 	GetResult() ReturnCode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go
index 2f5000d..d11a89a 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsNetId.go
@@ -38,17 +38,17 @@ type AmsNetId struct {
 
 // The corresponding interface
 type IAmsNetId interface {
-	// GetOctet1 returns Octet1
+	// GetOctet1 returns Octet1 (property field)
 	GetOctet1() uint8
-	// GetOctet2 returns Octet2
+	// GetOctet2 returns Octet2 (property field)
 	GetOctet2() uint8
-	// GetOctet3 returns Octet3
+	// GetOctet3 returns Octet3 (property field)
 	GetOctet3() uint8
-	// GetOctet4 returns Octet4
+	// GetOctet4 returns Octet4 (property field)
 	GetOctet4() uint8
-	// GetOctet5 returns Octet5
+	// GetOctet5 returns Octet5 (property field)
 	GetOctet5() uint8
-	// GetOctet6 returns Octet6
+	// GetOctet6 returns Octet6 (property field)
 	GetOctet6() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
index e754790..79089b8 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsPacket.go
@@ -41,23 +41,23 @@ type AmsPacket struct {
 
 // The corresponding interface
 type IAmsPacket interface {
-	// GetTargetAmsNetId returns TargetAmsNetId
+	// GetTargetAmsNetId returns TargetAmsNetId (property field)
 	GetTargetAmsNetId() *AmsNetId
-	// GetTargetAmsPort returns TargetAmsPort
+	// GetTargetAmsPort returns TargetAmsPort (property field)
 	GetTargetAmsPort() uint16
-	// GetSourceAmsNetId returns SourceAmsNetId
+	// GetSourceAmsNetId returns SourceAmsNetId (property field)
 	GetSourceAmsNetId() *AmsNetId
-	// GetSourceAmsPort returns SourceAmsPort
+	// GetSourceAmsPort returns SourceAmsPort (property field)
 	GetSourceAmsPort() uint16
-	// GetCommandId returns CommandId
+	// GetCommandId returns CommandId (property field)
 	GetCommandId() CommandId
-	// GetState returns State
+	// GetState returns State (property field)
 	GetState() *State
-	// GetErrorCode returns ErrorCode
+	// GetErrorCode returns ErrorCode (property field)
 	GetErrorCode() uint32
-	// GetInvokeId returns InvokeId
+	// GetInvokeId returns InvokeId (property field)
 	GetInvokeId() uint32
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() *AdsData
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
index 73bcddf..e61a59d 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialAcknowledgeFrame.go
@@ -38,17 +38,17 @@ type AmsSerialAcknowledgeFrame struct {
 
 // The corresponding interface
 type IAmsSerialAcknowledgeFrame interface {
-	// GetMagicCookie returns MagicCookie
+	// GetMagicCookie returns MagicCookie (property field)
 	GetMagicCookie() uint16
-	// GetTransmitterAddress returns TransmitterAddress
+	// GetTransmitterAddress returns TransmitterAddress (property field)
 	GetTransmitterAddress() int8
-	// GetReceiverAddress returns ReceiverAddress
+	// GetReceiverAddress returns ReceiverAddress (property field)
 	GetReceiverAddress() int8
-	// GetFragmentNumber returns FragmentNumber
+	// GetFragmentNumber returns FragmentNumber (property field)
 	GetFragmentNumber() int8
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() int8
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go
index 21be3b6..e973ac1 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialFrame.go
@@ -39,19 +39,19 @@ type AmsSerialFrame struct {
 
 // The corresponding interface
 type IAmsSerialFrame interface {
-	// GetMagicCookie returns MagicCookie
+	// GetMagicCookie returns MagicCookie (property field)
 	GetMagicCookie() uint16
-	// GetTransmitterAddress returns TransmitterAddress
+	// GetTransmitterAddress returns TransmitterAddress (property field)
 	GetTransmitterAddress() int8
-	// GetReceiverAddress returns ReceiverAddress
+	// GetReceiverAddress returns ReceiverAddress (property field)
 	GetReceiverAddress() int8
-	// GetFragmentNumber returns FragmentNumber
+	// GetFragmentNumber returns FragmentNumber (property field)
 	GetFragmentNumber() int8
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() int8
-	// GetUserdata returns Userdata
+	// GetUserdata returns Userdata (property field)
 	GetUserdata() *AmsPacket
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go
index 1df4172..9a332c5 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsSerialResetFrame.go
@@ -38,17 +38,17 @@ type AmsSerialResetFrame struct {
 
 // The corresponding interface
 type IAmsSerialResetFrame interface {
-	// GetMagicCookie returns MagicCookie
+	// GetMagicCookie returns MagicCookie (property field)
 	GetMagicCookie() uint16
-	// GetTransmitterAddress returns TransmitterAddress
+	// GetTransmitterAddress returns TransmitterAddress (property field)
 	GetTransmitterAddress() int8
-	// GetReceiverAddress returns ReceiverAddress
+	// GetReceiverAddress returns ReceiverAddress (property field)
 	GetReceiverAddress() int8
-	// GetFragmentNumber returns FragmentNumber
+	// GetFragmentNumber returns FragmentNumber (property field)
 	GetFragmentNumber() int8
-	// GetLength returns Length
+	// GetLength returns Length (property field)
 	GetLength() int8
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go b/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go
index f36c2b8..86796f7 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AmsTCPPacket.go
@@ -34,7 +34,7 @@ type AmsTCPPacket struct {
 
 // The corresponding interface
 type IAmsTCPPacket interface {
-	// GetUserdata returns Userdata
+	// GetUserdata returns Userdata (property field)
 	GetUserdata() *AmsPacket
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/State.go b/plc4go/internal/plc4go/ads/readwrite/model/State.go
index 8afd827..2d040f6 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/State.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/State.go
@@ -42,23 +42,23 @@ type State struct {
 
 // The corresponding interface
 type IState interface {
-	// GetInitCommand returns InitCommand
+	// GetInitCommand returns InitCommand (property field)
 	GetInitCommand() bool
-	// GetUpdCommand returns UpdCommand
+	// GetUpdCommand returns UpdCommand (property field)
 	GetUpdCommand() bool
-	// GetTimestampAdded returns TimestampAdded
+	// GetTimestampAdded returns TimestampAdded (property field)
 	GetTimestampAdded() bool
-	// GetHighPriorityCommand returns HighPriorityCommand
+	// GetHighPriorityCommand returns HighPriorityCommand (property field)
 	GetHighPriorityCommand() bool
-	// GetSystemCommand returns SystemCommand
+	// GetSystemCommand returns SystemCommand (property field)
 	GetSystemCommand() bool
-	// GetAdsCommand returns AdsCommand
+	// GetAdsCommand returns AdsCommand (property field)
 	GetAdsCommand() bool
-	// GetNoReturn returns NoReturn
+	// GetNoReturn returns NoReturn (property field)
 	GetNoReturn() bool
-	// GetResponse returns Response
+	// GetResponse returns Response (property field)
 	GetResponse() bool
-	// GetBroadcast returns Broadcast
+	// GetBroadcast returns Broadcast (property field)
 	GetBroadcast() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
index 0ef855b..398a49b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
@@ -36,8 +36,8 @@ type APDU struct {
 
 // The corresponding interface
 type IAPDU interface {
-	// ApduType returns ApduType
-	ApduType() uint8
+	// GetApduType returns ApduType (discriminator field)
+	GetApduType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -167,7 +167,7 @@ func (m *APDU) SerializeParent(writeBuffer utils.WriteBuffer, child IAPDU, seria
 	}
 
 	// Discriminator Field (apduType) (Used as input to a switch field)
-	apduType := uint8(child.ApduType())
+	apduType := uint8(child.GetApduType())
 	_apduTypeErr := writeBuffer.WriteUint8("apduType", 4, (apduType))
 
 	if _apduTypeErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
index 01a38e1..a5d6465 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
@@ -41,11 +41,11 @@ type APDUAbort struct {
 // The corresponding interface
 type IAPDUAbort interface {
 	IAPDU
-	// GetServer returns Server
+	// GetServer returns Server (property field)
 	GetServer() bool
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetAbortReason returns AbortReason
+	// GetAbortReason returns AbortReason (property field)
 	GetAbortReason() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
index 4afdd75..e2f7a27 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
@@ -47,21 +47,21 @@ type APDUComplexAck struct {
 // The corresponding interface
 type IAPDUComplexAck interface {
 	IAPDU
-	// GetSegmentedMessage returns SegmentedMessage
+	// GetSegmentedMessage returns SegmentedMessage (property field)
 	GetSegmentedMessage() bool
-	// GetMoreFollows returns MoreFollows
+	// GetMoreFollows returns MoreFollows (property field)
 	GetMoreFollows() bool
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() *uint8
-	// GetProposedWindowSize returns ProposedWindowSize
+	// GetProposedWindowSize returns ProposedWindowSize (property field)
 	GetProposedWindowSize() *uint8
-	// GetServiceAck returns ServiceAck
+	// GetServiceAck returns ServiceAck (property field)
 	GetServiceAck() *BACnetServiceAck
-	// GetSegmentServiceChoice returns SegmentServiceChoice
+	// GetSegmentServiceChoice returns SegmentServiceChoice (property field)
 	GetSegmentServiceChoice() *uint8
-	// GetSegment returns Segment
+	// GetSegment returns Segment (property field)
 	GetSegment() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index 001eccc..6aab1e1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -47,23 +47,23 @@ type APDUConfirmedRequest struct {
 // The corresponding interface
 type IAPDUConfirmedRequest interface {
 	IAPDU
-	// GetSegmentedMessage returns SegmentedMessage
+	// GetSegmentedMessage returns SegmentedMessage (property field)
 	GetSegmentedMessage() bool
-	// GetMoreFollows returns MoreFollows
+	// GetMoreFollows returns MoreFollows (property field)
 	GetMoreFollows() bool
-	// GetSegmentedResponseAccepted returns SegmentedResponseAccepted
+	// GetSegmentedResponseAccepted returns SegmentedResponseAccepted (property field)
 	GetSegmentedResponseAccepted() bool
-	// GetMaxSegmentsAccepted returns MaxSegmentsAccepted
+	// GetMaxSegmentsAccepted returns MaxSegmentsAccepted (property field)
 	GetMaxSegmentsAccepted() uint8
-	// GetMaxApduLengthAccepted returns MaxApduLengthAccepted
+	// GetMaxApduLengthAccepted returns MaxApduLengthAccepted (property field)
 	GetMaxApduLengthAccepted() uint8
-	// GetInvokeId returns InvokeId
+	// GetInvokeId returns InvokeId (property field)
 	GetInvokeId() uint8
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() *uint8
-	// GetProposedWindowSize returns ProposedWindowSize
+	// GetProposedWindowSize returns ProposedWindowSize (property field)
 	GetProposedWindowSize() *uint8
-	// GetServiceRequest returns ServiceRequest
+	// GetServiceRequest returns ServiceRequest (property field)
 	GetServiceRequest() *BACnetConfirmedServiceRequest
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
index 93accd7..5d4b4f0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
@@ -40,9 +40,9 @@ type APDUError struct {
 // The corresponding interface
 type IAPDUError interface {
 	IAPDU
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetError returns Error
+	// GetError returns Error (property field)
 	GetError() *BACnetError
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
index e570554..40ad205 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
@@ -40,9 +40,9 @@ type APDUReject struct {
 // The corresponding interface
 type IAPDUReject interface {
 	IAPDU
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetRejectReason returns RejectReason
+	// GetRejectReason returns RejectReason (property field)
 	GetRejectReason() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
index cd0ab5d..deee579 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -43,15 +43,15 @@ type APDUSegmentAck struct {
 // The corresponding interface
 type IAPDUSegmentAck interface {
 	IAPDU
-	// GetNegativeAck returns NegativeAck
+	// GetNegativeAck returns NegativeAck (property field)
 	GetNegativeAck() bool
-	// GetServer returns Server
+	// GetServer returns Server (property field)
 	GetServer() bool
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() uint8
-	// GetProposedWindowSize returns ProposedWindowSize
+	// GetProposedWindowSize returns ProposedWindowSize (property field)
 	GetProposedWindowSize() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
index ec7e37f..b777aa6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -40,9 +40,9 @@ type APDUSimpleAck struct {
 // The corresponding interface
 type IAPDUSimpleAck interface {
 	IAPDU
-	// GetOriginalInvokeId returns OriginalInvokeId
+	// GetOriginalInvokeId returns OriginalInvokeId (property field)
 	GetOriginalInvokeId() uint8
-	// GetServiceChoice returns ServiceChoice
+	// GetServiceChoice returns ServiceChoice (property field)
 	GetServiceChoice() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 146a696..731a43d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -39,7 +39,7 @@ type APDUUnconfirmedRequest struct {
 // The corresponding interface
 type IAPDUUnconfirmedRequest interface {
 	IAPDU
-	// GetServiceRequest returns ServiceRequest
+	// GetServiceRequest returns ServiceRequest (property field)
 	GetServiceRequest() *BACnetUnconfirmedServiceRequest
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
index c633b99..cab5237 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
@@ -38,7 +38,7 @@ type APDUUnknown struct {
 // The corresponding interface
 type IAPDUUnknown interface {
 	IAPDU
-	// GetUnknownBytes returns UnknownBytes
+	// GetUnknownBytes returns UnknownBytes (property field)
 	GetUnknownBytes() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go
index 7e5d6ae..424a48f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAction.go
@@ -37,11 +37,11 @@ type BACnetAction struct {
 
 // The corresponding interface
 type IBACnetAction interface {
-	// GetRawData returns RawData
+	// GetRawData returns RawData (property field)
 	GetRawData() *BACnetContextTagEnumerated
-	// GetIsDirect returns IsDirect
+	// GetIsDirect returns IsDirect (virtual field)
 	GetIsDirect() bool
-	// GetIsReverse returns IsReverse
+	// GetIsReverse returns IsReverse (virtual field)
 	GetIsReverse() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
index 02c3f5c..10402a8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetActionCommand.go
@@ -42,23 +42,23 @@ type BACnetActionCommand struct {
 
 // The corresponding interface
 type IBACnetActionCommand interface {
-	// GetDeviceIdentifier returns DeviceIdentifier
+	// GetDeviceIdentifier returns DeviceIdentifier (property field)
 	GetDeviceIdentifier() *BACnetContextTagObjectIdentifier
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
-	// GetPropertyValue returns PropertyValue
+	// GetPropertyValue returns PropertyValue (property field)
 	GetPropertyValue() *BACnetConstructedData
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() *BACnetContextTagUnsignedInteger
-	// GetPostDelay returns PostDelay
+	// GetPostDelay returns PostDelay (property field)
 	GetPostDelay() *BACnetContextTagBoolean
-	// GetQuitOnFailure returns QuitOnFailure
+	// GetQuitOnFailure returns QuitOnFailure (property field)
 	GetQuitOnFailure() *BACnetContextTagBoolean
-	// GetWriteSuccessful returns WriteSuccessful
+	// GetWriteSuccessful returns WriteSuccessful (property field)
 	GetWriteSuccessful() *BACnetContextTagBoolean
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
index 40d6364..2dfbe29 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetAddress.go
@@ -34,9 +34,9 @@ type BACnetAddress struct {
 
 // The corresponding interface
 type IBACnetAddress interface {
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() []uint8
-	// GetPort returns Port
+	// GetPort returns Port (property field)
 	GetPort() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go
index 93f0c70..2f17e38 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTag.go
@@ -34,13 +34,11 @@ type BACnetApplicationTag struct {
 
 // The corresponding interface
 type IBACnetApplicationTag interface {
-	// ActualTagNumber returns ActualTagNumber
-	ActualTagNumber() uint8
-	// GetHeader returns Header
+	// GetHeader returns Header (property field)
 	GetHeader() *BACnetTagHeader
-	// GetActualTagNumber returns ActualTagNumber
+	// GetActualTagNumber returns ActualTagNumber (virtual field)
 	GetActualTagNumber() uint8
-	// GetActualLength returns ActualLength
+	// GetActualLength returns ActualLength (virtual field)
 	GetActualLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
index b43507a..937453d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBitString.go
@@ -35,7 +35,7 @@ type BACnetApplicationTagBitString struct {
 // The corresponding interface
 type IBACnetApplicationTagBitString interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadBitString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type IBACnetApplicationTagBitString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagBitString) ActualTagNumber() uint8 {
-	return 0x8
-}
-
-func (m *BACnetApplicationTagBitString) GetActualTagNumber() uint8 {
-	return 0x8
-}
 
 func (m *BACnetApplicationTagBitString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
index 1d2395f..b130cde 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagBoolean.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagBoolean struct {
 // The corresponding interface
 type IBACnetApplicationTagBoolean interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadBoolean
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagBoolean interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagBoolean) ActualTagNumber() uint8 {
-	return 0x1
-}
-
-func (m *BACnetApplicationTagBoolean) GetActualTagNumber() uint8 {
-	return 0x1
-}
 
 func (m *BACnetApplicationTagBoolean) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
index 81b75f3..46ca4f0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagCharacterString.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagCharacterString struct {
 // The corresponding interface
 type IBACnetApplicationTagCharacterString interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadCharacterString
-	// GetValue returns Value
+	// GetValue returns Value (virtual field)
 	GetValue() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagCharacterString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagCharacterString) ActualTagNumber() uint8 {
-	return 0x7
-}
-
-func (m *BACnetApplicationTagCharacterString) GetActualTagNumber() uint8 {
-	return 0x7
-}
 
 func (m *BACnetApplicationTagCharacterString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go
index 2bd25d0..064197f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDate.go
@@ -35,7 +35,7 @@ type BACnetApplicationTagDate struct {
 // The corresponding interface
 type IBACnetApplicationTagDate interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadDate
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type IBACnetApplicationTagDate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagDate) ActualTagNumber() uint8 {
-	return 0xA
-}
-
-func (m *BACnetApplicationTagDate) GetActualTagNumber() uint8 {
-	return 0xA
-}
 
 func (m *BACnetApplicationTagDate) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
index 4d47a6d..5123b38 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagDouble.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagDouble struct {
 // The corresponding interface
 type IBACnetApplicationTagDouble interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadDouble
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() float64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagDouble interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagDouble) ActualTagNumber() uint8 {
-	return 0x5
-}
-
-func (m *BACnetApplicationTagDouble) GetActualTagNumber() uint8 {
-	return 0x5
-}
 
 func (m *BACnetApplicationTagDouble) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
index 97848f2..460ef49 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagEnumerated.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagEnumerated struct {
 // The corresponding interface
 type IBACnetApplicationTagEnumerated interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadEnumerated
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagEnumerated interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagEnumerated) ActualTagNumber() uint8 {
-	return 0x9
-}
-
-func (m *BACnetApplicationTagEnumerated) GetActualTagNumber() uint8 {
-	return 0x9
-}
 
 func (m *BACnetApplicationTagEnumerated) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go
index 4cd5957..e24a5e9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagNull.go
@@ -44,13 +44,6 @@ type IBACnetApplicationTagNull interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagNull) ActualTagNumber() uint8 {
-	return 0x0
-}
-
-func (m *BACnetApplicationTagNull) GetActualTagNumber() uint8 {
-	return 0x0
-}
 
 func (m *BACnetApplicationTagNull) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
index c0bca1a..d2cd87a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagObjectIdentifier.go
@@ -35,11 +35,11 @@ type BACnetApplicationTagObjectIdentifier struct {
 // The corresponding interface
 type IBACnetApplicationTagObjectIdentifier interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadObjectIdentifier
-	// GetObjectType returns ObjectType
+	// GetObjectType returns ObjectType (virtual field)
 	GetObjectType() BACnetObjectType
-	// GetInstanceNumber returns InstanceNumber
+	// GetInstanceNumber returns InstanceNumber (virtual field)
 	GetInstanceNumber() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type IBACnetApplicationTagObjectIdentifier interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagObjectIdentifier) ActualTagNumber() uint8 {
-	return 0xC
-}
-
-func (m *BACnetApplicationTagObjectIdentifier) GetActualTagNumber() uint8 {
-	return 0xC
-}
 
 func (m *BACnetApplicationTagObjectIdentifier) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
index a5d3e4f..dd5a819 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagOctetString.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagOctetString struct {
 // The corresponding interface
 type IBACnetApplicationTagOctetString interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadOctetString
-	// GetValue returns Value
+	// GetValue returns Value (virtual field)
 	GetValue() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagOctetString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagOctetString) ActualTagNumber() uint8 {
-	return 0x6
-}
-
-func (m *BACnetApplicationTagOctetString) GetActualTagNumber() uint8 {
-	return 0x6
-}
 
 func (m *BACnetApplicationTagOctetString) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go
index 87e0a75..4b66c05 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagReal.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagReal struct {
 // The corresponding interface
 type IBACnetApplicationTagReal interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadReal
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() float32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagReal interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagReal) ActualTagNumber() uint8 {
-	return 0x4
-}
-
-func (m *BACnetApplicationTagReal) GetActualTagNumber() uint8 {
-	return 0x4
-}
 
 func (m *BACnetApplicationTagReal) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
index 05ce389..11631ba 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagSignedInteger.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagSignedInteger struct {
 // The corresponding interface
 type IBACnetApplicationTagSignedInteger interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadSignedInteger
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagSignedInteger interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagSignedInteger) ActualTagNumber() uint8 {
-	return 0x3
-}
-
-func (m *BACnetApplicationTagSignedInteger) GetActualTagNumber() uint8 {
-	return 0x3
-}
 
 func (m *BACnetApplicationTagSignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go
index 17628b7..911ed57 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagTime.go
@@ -35,7 +35,7 @@ type BACnetApplicationTagTime struct {
 // The corresponding interface
 type IBACnetApplicationTagTime interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type IBACnetApplicationTagTime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagTime) ActualTagNumber() uint8 {
-	return 0xB
-}
-
-func (m *BACnetApplicationTagTime) GetActualTagNumber() uint8 {
-	return 0xB
-}
 
 func (m *BACnetApplicationTagTime) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
index 10e2e4c..9d4a80e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetApplicationTagUnsignedInteger.go
@@ -35,9 +35,9 @@ type BACnetApplicationTagUnsignedInteger struct {
 // The corresponding interface
 type IBACnetApplicationTagUnsignedInteger interface {
 	IBACnetApplicationTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadUnsignedInteger
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -50,13 +50,6 @@ type IBACnetApplicationTagUnsignedInteger interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetApplicationTagUnsignedInteger) ActualTagNumber() uint8 {
-	return 0x2
-}
-
-func (m *BACnetApplicationTagUnsignedInteger) GetActualTagNumber() uint8 {
-	return 0x2
-}
 
 func (m *BACnetApplicationTagUnsignedInteger) InitializeParent(parent *BACnetApplicationTag, header *BACnetTagHeader) {
 	m.BACnetApplicationTag.Header = header
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go
index 20d7942..1a054eb 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetBinaryPV.go
@@ -37,11 +37,11 @@ type BACnetBinaryPV struct {
 
 // The corresponding interface
 type IBACnetBinaryPV interface {
-	// GetRawData returns RawData
+	// GetRawData returns RawData (property field)
 	GetRawData() *BACnetContextTagEnumerated
-	// GetIsInactive returns IsInactive
+	// GetIsInactive returns IsInactive (virtual field)
 	GetIsInactive() bool
-	// GetIsActive returns IsActive
+	// GetIsActive returns IsActive (virtual field)
 	GetIsActive() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
index 345800c..47b8742 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACK.go
@@ -33,8 +33,8 @@ type BACnetConfirmedServiceACK struct {
 
 // The corresponding interface
 type IBACnetConfirmedServiceACK interface {
-	// ServiceChoice returns ServiceChoice
-	ServiceChoice() uint8
+	// GetServiceChoice returns ServiceChoice (discriminator field)
+	GetServiceChoice() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -176,7 +176,7 @@ func (m *BACnetConfirmedServiceACK) SerializeParent(writeBuffer utils.WriteBuffe
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.ServiceChoice())
+	serviceChoice := uint8(child.GetServiceChoice())
 	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
 
 	if _serviceChoiceErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 37c3f97..6afeeac 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -36,8 +36,8 @@ type BACnetConfirmedServiceRequest struct {
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequest interface {
-	// ServiceChoice returns ServiceChoice
-	ServiceChoice() uint8
+	// GetServiceChoice returns ServiceChoice (discriminator field)
+	GetServiceChoice() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -213,7 +213,7 @@ func (m *BACnetConfirmedServiceRequest) SerializeParent(writeBuffer utils.WriteB
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.ServiceChoice())
+	serviceChoice := uint8(child.GetServiceChoice())
 	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
 
 	if _serviceChoiceErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index d4f9e38..59b729f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -39,9 +39,9 @@ type BACnetConfirmedServiceRequestAtomicReadFile struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicReadFile interface {
 	IBACnetConfirmedServiceRequest
-	// GetFileIdentifier returns FileIdentifier
+	// GetFileIdentifier returns FileIdentifier (property field)
 	GetFileIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetAccessMethod returns AccessMethod
+	// GetAccessMethod returns AccessMethod (property field)
 	GetAccessMethod() *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
index abce760..30e0540 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileRecord.go
@@ -36,9 +36,9 @@ type BACnetConfirmedServiceRequestAtomicReadFileRecord struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicReadFileRecord interface {
 	IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord
-	// GetFileStartRecord returns FileStartRecord
+	// GetFileStartRecord returns FileStartRecord (property field)
 	GetFileStartRecord() *BACnetApplicationTagSignedInteger
-	// GetRequestRecordCount returns RequestRecordCount
+	// GetRequestRecordCount returns RequestRecordCount (property field)
 	GetRequestRecordCount() *BACnetApplicationTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetConfirmedServiceRequestAtomicReadFileRecord interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) PeekedTagNumber() uint8 {
-	return 0x1
-}
-
-func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) GetPeekedTagNumber() uint8 {
-	return 0x1
-}
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFileRecord) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
index 84f4666..4df70f9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStream.go
@@ -36,9 +36,9 @@ type BACnetConfirmedServiceRequestAtomicReadFileStream struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicReadFileStream interface {
 	IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord
-	// GetFileStartPosition returns FileStartPosition
+	// GetFileStartPosition returns FileStartPosition (property field)
 	GetFileStartPosition() *BACnetApplicationTagSignedInteger
-	// GetRequestOctetCount returns RequestOctetCount
+	// GetRequestOctetCount returns RequestOctetCount (property field)
 	GetRequestOctetCount() *BACnetApplicationTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetConfirmedServiceRequestAtomicReadFileStream interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) PeekedTagNumber() uint8 {
-	return 0x0
-}
-
-func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) GetPeekedTagNumber() uint8 {
-	return 0x0
-}
 
 func (m *BACnetConfirmedServiceRequestAtomicReadFileStream) InitializeParent(parent *BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
index c94a832..df75d3d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
@@ -36,15 +36,13 @@ type BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord struct {
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index a4e1c06..d5a260f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -43,15 +43,15 @@ type BACnetConfirmedServiceRequestAtomicWriteFile struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestAtomicWriteFile interface {
 	IBACnetConfirmedServiceRequest
-	// GetDeviceIdentifier returns DeviceIdentifier
+	// GetDeviceIdentifier returns DeviceIdentifier (property field)
 	GetDeviceIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetFileStartPosition returns FileStartPosition
+	// GetFileStartPosition returns FileStartPosition (property field)
 	GetFileStartPosition() *BACnetApplicationTagSignedInteger
-	// GetFileData returns FileData
+	// GetFileData returns FileData (property field)
 	GetFileData() *BACnetApplicationTagOctetString
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index 5460322..2936d82 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -42,15 +42,15 @@ type BACnetConfirmedServiceRequestConfirmedCOVNotification struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestConfirmedCOVNotification interface {
 	IBACnetConfirmedServiceRequest
-	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier
+	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier (property field)
 	GetSubscriberProcessIdentifier() *BACnetContextTagUnsignedInteger
-	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier
+	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier (property field)
 	GetInitiatingDeviceIdentifier() *BACnetContextTagObjectIdentifier
-	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier
+	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier (property field)
 	GetMonitoredObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetLifetimeInSeconds returns LifetimeInSeconds
+	// GetLifetimeInSeconds returns LifetimeInSeconds (property field)
 	GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger
-	// GetListOfValues returns ListOfValues
+	// GetListOfValues returns ListOfValues (property field)
 	GetListOfValues() *BACnetPropertyValues
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 1a43d6a..8b765d8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -51,31 +51,31 @@ type BACnetConfirmedServiceRequestConfirmedEventNotification struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestConfirmedEventNotification interface {
 	IBACnetConfirmedServiceRequest
-	// GetProcessIdentifier returns ProcessIdentifier
+	// GetProcessIdentifier returns ProcessIdentifier (property field)
 	GetProcessIdentifier() *BACnetContextTagUnsignedInteger
-	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier
+	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier (property field)
 	GetInitiatingDeviceIdentifier() *BACnetContextTagObjectIdentifier
-	// GetEventObjectIdentifier returns EventObjectIdentifier
+	// GetEventObjectIdentifier returns EventObjectIdentifier (property field)
 	GetEventObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetTimestamp returns Timestamp
+	// GetTimestamp returns Timestamp (property field)
 	GetTimestamp() *BACnetTimeStamp
-	// GetNotificationClass returns NotificationClass
+	// GetNotificationClass returns NotificationClass (property field)
 	GetNotificationClass() *BACnetContextTagUnsignedInteger
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() *BACnetContextTagUnsignedInteger
-	// GetEventType returns EventType
+	// GetEventType returns EventType (property field)
 	GetEventType() *BACnetContextTagEventType
-	// GetMessageText returns MessageText
+	// GetMessageText returns MessageText (property field)
 	GetMessageText() *BACnetContextTagCharacterString
-	// GetNotifyType returns NotifyType
+	// GetNotifyType returns NotifyType (property field)
 	GetNotifyType() *BACnetContextTagNotifyType
-	// GetAckRequired returns AckRequired
+	// GetAckRequired returns AckRequired (property field)
 	GetAckRequired() *BACnetContextTagBoolean
-	// GetFromState returns FromState
+	// GetFromState returns FromState (property field)
 	GetFromState() *BACnetContextTagEventState
-	// GetToState returns ToState
+	// GetToState returns ToState (property field)
 	GetToState() *BACnetContextTagEventState
-	// GetEventValues returns EventValues
+	// GetEventValues returns EventValues (property field)
 	GetEventValues() *BACnetNotificationParameters
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
index 096b805..21046f9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
@@ -38,7 +38,7 @@ type BACnetConfirmedServiceRequestConfirmedUnknown struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestConfirmedUnknown interface {
 	IBACnetConfirmedServiceRequest
-	// GetUnknownBytes returns UnknownBytes
+	// GetUnknownBytes returns UnknownBytes (property field)
 	GetUnknownBytes() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index 3e93c65..f06ab1f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -41,11 +41,11 @@ type BACnetConfirmedServiceRequestDeviceCommunicationControl struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestDeviceCommunicationControl interface {
 	IBACnetConfirmedServiceRequest
-	// GetTimeDuration returns TimeDuration
+	// GetTimeDuration returns TimeDuration (property field)
 	GetTimeDuration() *BACnetContextTagUnsignedInteger
-	// GetEnableDisable returns EnableDisable
+	// GetEnableDisable returns EnableDisable (property field)
 	GetEnableDisable() *BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable
-	// GetPassword returns Password
+	// GetPassword returns Password (property field)
 	GetPassword() *BACnetContextTagCharacterString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 0d59370..97b1c18 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -41,11 +41,11 @@ type BACnetConfirmedServiceRequestReadProperty struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestReadProperty interface {
 	IBACnetConfirmedServiceRequest
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index 1388782..30c5256 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -38,7 +38,7 @@ type BACnetConfirmedServiceRequestReadPropertyMultiple struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestReadPropertyMultiple interface {
 	IBACnetConfirmedServiceRequest
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []*BACnetReadAccessSpecification
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index cc903ce..7e73e55 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -40,9 +40,9 @@ type BACnetConfirmedServiceRequestReinitializeDevice struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestReinitializeDevice interface {
 	IBACnetConfirmedServiceRequest
-	// GetReinitializedStateOfDevice returns ReinitializedStateOfDevice
+	// GetReinitializedStateOfDevice returns ReinitializedStateOfDevice (property field)
 	GetReinitializedStateOfDevice() *BACnetContextTagDeviceState
-	// GetPassword returns Password
+	// GetPassword returns Password (property field)
 	GetPassword() *BACnetContextTagCharacterString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go
index e116261..c94143a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable.go
@@ -37,13 +37,13 @@ type BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable struct {
 
 // The corresponding interface
 type IBACnetConfirmedServiceRequestReinitializeDeviceEnableDisable interface {
-	// GetRawData returns RawData
+	// GetRawData returns RawData (property field)
 	GetRawData() *BACnetContextTagEnumerated
-	// GetIsEnable returns IsEnable
+	// GetIsEnable returns IsEnable (virtual field)
 	GetIsEnable() bool
-	// GetIsDisable returns IsDisable
+	// GetIsDisable returns IsDisable (virtual field)
 	GetIsDisable() bool
-	// GetIsDisableInitiation returns IsDisableInitiation
+	// GetIsDisableInitiation returns IsDisableInitiation (virtual field)
 	GetIsDisableInitiation() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index b4cb025..92bb481 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -41,13 +41,13 @@ type BACnetConfirmedServiceRequestSubscribeCOV struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestSubscribeCOV interface {
 	IBACnetConfirmedServiceRequest
-	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier
+	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier (property field)
 	GetSubscriberProcessIdentifier() *BACnetContextTagUnsignedInteger
-	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier
+	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier (property field)
 	GetMonitoredObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetIssueConfirmed returns IssueConfirmed
+	// GetIssueConfirmed returns IssueConfirmed (property field)
 	GetIssueConfirmed() *BACnetContextTagBoolean
-	// GetLifetimeInSeconds returns LifetimeInSeconds
+	// GetLifetimeInSeconds returns LifetimeInSeconds (property field)
 	GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index d05fee0..98d25fe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -43,15 +43,15 @@ type BACnetConfirmedServiceRequestWriteProperty struct {
 // The corresponding interface
 type IBACnetConfirmedServiceRequestWriteProperty interface {
 	IBACnetConfirmedServiceRequest
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
-	// GetPropertyValue returns PropertyValue
+	// GetPropertyValue returns PropertyValue (property field)
 	GetPropertyValue() *BACnetConstructedData
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
index da75aea..6082c04 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedData.go
@@ -39,15 +39,13 @@ type BACnetConstructedData struct {
 
 // The corresponding interface
 type IBACnetConstructedData interface {
-	// ObjectType returns ObjectType
-	ObjectType() BACnetObjectType
-	// PropertyIdentifierEnum returns PropertyIdentifierEnum
-	PropertyIdentifierEnum() BACnetPropertyIdentifier
-	// GetOpeningTag returns OpeningTag
+	// GetObjectType returns ObjectType (discriminator field)
+	GetObjectType() BACnetObjectType
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPropertyIdentifierEnum returns PropertyIdentifierEnum
+	// GetPropertyIdentifierEnum returns PropertyIdentifierEnum (virtual field)
 	GetPropertyIdentifierEnum() BACnetPropertyIdentifier
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
index 80bb3b6..5c96533 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
@@ -41,11 +41,11 @@ type BACnetConstructedDataCommand struct {
 // The corresponding interface
 type IBACnetConstructedDataCommand interface {
 	IBACnetConstructedData
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetAction returns Action
+	// GetAction returns Action (property field)
 	GetAction() []*BACnetActionCommand
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -66,14 +66,6 @@ func (m *BACnetConstructedDataCommand) GetObjectType() BACnetObjectType {
 	return BACnetObjectType_COMMAND
 }
 
-func (m *BACnetConstructedDataCommand) PropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
-func (m *BACnetConstructedDataCommand) GetPropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
 func (m *BACnetConstructedDataCommand) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConstructedData.OpeningTag = openingTag
 	m.BACnetConstructedData.ClosingTag = closingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go
index f64d3a2..93088f8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataElement.go
@@ -41,21 +41,21 @@ type BACnetConstructedDataElement struct {
 
 // The corresponding interface
 type IBACnetConstructedDataElement interface {
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetApplicationTag returns ApplicationTag
+	// GetApplicationTag returns ApplicationTag (property field)
 	GetApplicationTag() *BACnetApplicationTag
-	// GetContextTag returns ContextTag
+	// GetContextTag returns ContextTag (property field)
 	GetContextTag() *BACnetContextTag
-	// GetConstructedData returns ConstructedData
+	// GetConstructedData returns ConstructedData (property field)
 	GetConstructedData() *BACnetConstructedData
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
-	// GetIsApplicationTag returns IsApplicationTag
+	// GetIsApplicationTag returns IsApplicationTag (virtual field)
 	GetIsApplicationTag() bool
-	// GetIsConstructedData returns IsConstructedData
+	// GetIsConstructedData returns IsConstructedData (virtual field)
 	GetIsConstructedData() bool
-	// GetIsContextTag returns IsContextTag
+	// GetIsContextTag returns IsContextTag (virtual field)
 	GetIsContextTag() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
index 932a6c0..558c522 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
@@ -41,11 +41,11 @@ type BACnetConstructedDataEventTimestamps struct {
 // The corresponding interface
 type IBACnetConstructedDataEventTimestamps interface {
 	IBACnetConstructedData
-	// GetToOffnormal returns ToOffnormal
+	// GetToOffnormal returns ToOffnormal (property field)
 	GetToOffnormal() *BACnetContextTagTime
-	// GetToFault returns ToFault
+	// GetToFault returns ToFault (property field)
 	GetToFault() *BACnetContextTagUnsignedInteger
-	// GetToNormal returns ToNormal
+	// GetToNormal returns ToNormal (property field)
 	GetToNormal() *BACnetDateTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -66,14 +66,6 @@ func (m *BACnetConstructedDataEventTimestamps) GetObjectType() BACnetObjectType
 	return 0
 }
 
-func (m *BACnetConstructedDataEventTimestamps) PropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return BACnetPropertyIdentifier_EVENT_TIME_STAMPS
-}
-
-func (m *BACnetConstructedDataEventTimestamps) GetPropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return BACnetPropertyIdentifier_EVENT_TIME_STAMPS
-}
-
 func (m *BACnetConstructedDataEventTimestamps) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConstructedData.OpeningTag = openingTag
 	m.BACnetConstructedData.ClosingTag = closingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
index 470c371..6c15725 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
@@ -39,7 +39,7 @@ type BACnetConstructedDataLifeSafetyZone struct {
 // The corresponding interface
 type IBACnetConstructedDataLifeSafetyZone interface {
 	IBACnetConstructedData
-	// GetZones returns Zones
+	// GetZones returns Zones (property field)
 	GetZones() []*BACnetContextTagObjectIdentifier
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -60,14 +60,6 @@ func (m *BACnetConstructedDataLifeSafetyZone) GetObjectType() BACnetObjectType {
 	return BACnetObjectType_LIFE_SAFETY_ZONE
 }
 
-func (m *BACnetConstructedDataLifeSafetyZone) PropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
-func (m *BACnetConstructedDataLifeSafetyZone) GetPropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
 func (m *BACnetConstructedDataLifeSafetyZone) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConstructedData.OpeningTag = openingTag
 	m.BACnetConstructedData.ClosingTag = closingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
index 8811a39..18cd005 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
@@ -42,13 +42,13 @@ type BACnetConstructedDataUnspecified struct {
 // The corresponding interface
 type IBACnetConstructedDataUnspecified interface {
 	IBACnetConstructedData
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []*BACnetConstructedDataElement
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetContent returns Content
+	// GetContent returns Content (property field)
 	GetContent() *BACnetApplicationTag
-	// GetHasData returns HasData
+	// GetHasData returns HasData (virtual field)
 	GetHasData() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -69,14 +69,6 @@ func (m *BACnetConstructedDataUnspecified) GetObjectType() BACnetObjectType {
 	return 0
 }
 
-func (m *BACnetConstructedDataUnspecified) PropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
-func (m *BACnetConstructedDataUnspecified) GetPropertyIdentifierEnum() BACnetPropertyIdentifier {
-	return 0
-}
-
 func (m *BACnetConstructedDataUnspecified) InitializeParent(parent *BACnetConstructedData, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetConstructedData.OpeningTag = openingTag
 	m.BACnetConstructedData.ClosingTag = closingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go
index 803b8d4..845be28 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTag.go
@@ -37,15 +37,15 @@ type BACnetContextTag struct {
 
 // The corresponding interface
 type IBACnetContextTag interface {
-	// DataType returns DataType
-	DataType() BACnetDataType
-	// GetHeader returns Header
+	// GetDataType returns DataType (discriminator field)
+	GetDataType() BACnetDataType
+	// GetHeader returns Header (property field)
 	GetHeader() *BACnetTagHeader
-	// GetTagNumber returns TagNumber
+	// GetTagNumber returns TagNumber (virtual field)
 	GetTagNumber() uint8
-	// GetActualLength returns ActualLength
+	// GetActualLength returns ActualLength (virtual field)
 	GetActualLength() uint32
-	// GetIsNotOpeningOrClosingTag returns IsNotOpeningOrClosingTag
+	// GetIsNotOpeningOrClosingTag returns IsNotOpeningOrClosingTag (virtual field)
 	GetIsNotOpeningOrClosingTag() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
index f7f6ba9..e443dbb 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
@@ -39,7 +39,7 @@ type BACnetContextTagBitString struct {
 // The corresponding interface
 type IBACnetContextTagBitString interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadBitString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
index 123bbd7..8979a7d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
@@ -40,11 +40,11 @@ type BACnetContextTagBoolean struct {
 // The corresponding interface
 type IBACnetContextTagBoolean interface {
 	IBACnetContextTag
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint8
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadBoolean
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
index d204d87..716bb83 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
@@ -39,7 +39,7 @@ type BACnetContextTagCharacterString struct {
 // The corresponding interface
 type IBACnetContextTagCharacterString interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadCharacterString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
index d0fc4c7..bf8bc21 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
@@ -39,7 +39,7 @@ type BACnetContextTagDate struct {
 // The corresponding interface
 type IBACnetContextTagDate interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadDate
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
index 698c1a6..7e8b971 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
@@ -39,7 +39,7 @@ type BACnetContextTagDeviceState struct {
 // The corresponding interface
 type IBACnetContextTagDeviceState interface {
 	IBACnetContextTag
-	// GetState returns State
+	// GetState returns State (property field)
 	GetState() BACnetDeviceState
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
index 2f47339..01157d2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
@@ -39,9 +39,9 @@ type BACnetContextTagDouble struct {
 // The corresponding interface
 type IBACnetContextTagDouble interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadDouble
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() float64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
index 05e5a89..4b8032b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
@@ -39,9 +39,9 @@ type BACnetContextTagEnumerated struct {
 // The corresponding interface
 type IBACnetContextTagEnumerated interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadEnumerated
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
index 71978e5..573cbdd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
@@ -41,11 +41,11 @@ type BACnetContextTagEventState struct {
 // The corresponding interface
 type IBACnetContextTagEventState interface {
 	IBACnetContextTag
-	// GetEventState returns EventState
+	// GetEventState returns EventState (property field)
 	GetEventState() BACnetEventState
-	// GetProprietaryValue returns ProprietaryValue
+	// GetProprietaryValue returns ProprietaryValue (property field)
 	GetProprietaryValue() uint32
-	// GetIsProprietary returns IsProprietary
+	// GetIsProprietary returns IsProprietary (virtual field)
 	GetIsProprietary() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
index d861c36..8463a85 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
@@ -41,11 +41,11 @@ type BACnetContextTagEventType struct {
 // The corresponding interface
 type IBACnetContextTagEventType interface {
 	IBACnetContextTag
-	// GetEventType returns EventType
+	// GetEventType returns EventType (property field)
 	GetEventType() BACnetEventType
-	// GetProprietaryValue returns ProprietaryValue
+	// GetProprietaryValue returns ProprietaryValue (property field)
 	GetProprietaryValue() uint32
-	// GetIsProprietary returns IsProprietary
+	// GetIsProprietary returns IsProprietary (virtual field)
 	GetIsProprietary() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
index bc3efc0..a145635 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
@@ -40,7 +40,7 @@ type BACnetContextTagNotifyType struct {
 // The corresponding interface
 type IBACnetContextTagNotifyType interface {
 	IBACnetContextTag
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() BACnetNotifyType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
index dae99f4..3c230f5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
@@ -39,11 +39,11 @@ type BACnetContextTagObjectIdentifier struct {
 // The corresponding interface
 type IBACnetContextTagObjectIdentifier interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadObjectIdentifier
-	// GetObjectType returns ObjectType
+	// GetObjectType returns ObjectType (virtual field)
 	GetObjectType() BACnetObjectType
-	// GetInstanceNumber returns InstanceNumber
+	// GetInstanceNumber returns InstanceNumber (virtual field)
 	GetInstanceNumber() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
index 9e7b085..64b9b92 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
@@ -39,7 +39,7 @@ type BACnetContextTagOctetString struct {
 // The corresponding interface
 type IBACnetContextTagOctetString interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadOctetString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
index 0b208ab..5732d0d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
@@ -41,11 +41,11 @@ type BACnetContextTagPropertyIdentifier struct {
 // The corresponding interface
 type IBACnetContextTagPropertyIdentifier interface {
 	IBACnetContextTag
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() BACnetPropertyIdentifier
-	// GetProprietaryValue returns ProprietaryValue
+	// GetProprietaryValue returns ProprietaryValue (property field)
 	GetProprietaryValue() uint32
-	// GetIsProprietary returns IsProprietary
+	// GetIsProprietary returns IsProprietary (virtual field)
 	GetIsProprietary() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
index 0cab2ad..639c404 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
@@ -39,9 +39,9 @@ type BACnetContextTagReal struct {
 // The corresponding interface
 type IBACnetContextTagReal interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadReal
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() float32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
index 42ffabd..8980963 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
@@ -39,9 +39,9 @@ type BACnetContextTagSignedInteger struct {
 // The corresponding interface
 type IBACnetContextTagSignedInteger interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadSignedInteger
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
index b610fc4..ba4eb84 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
@@ -39,7 +39,7 @@ type BACnetContextTagTime struct {
 // The corresponding interface
 type IBACnetContextTagTime interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
index 76b22a6..fffb4fe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
@@ -39,9 +39,9 @@ type BACnetContextTagUnsignedInteger struct {
 // The corresponding interface
 type IBACnetContextTagUnsignedInteger interface {
 	IBACnetContextTag
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *BACnetTagPayloadUnsignedInteger
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
index c0eb41b..1b902d4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDateTime.go
@@ -39,13 +39,13 @@ type BACnetDateTime struct {
 
 // The corresponding interface
 type IBACnetDateTime interface {
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetDateValue returns DateValue
+	// GetDateValue returns DateValue (property field)
 	GetDateValue() *BACnetApplicationTagDate
-	// GetTimeValue returns TimeValue
+	// GetTimeValue returns TimeValue (property field)
 	GetTimeValue() *BACnetApplicationTagTime
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
index 01b1095..e015f2b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetDeviceObjectPropertyReference.go
@@ -42,17 +42,17 @@ type BACnetDeviceObjectPropertyReference struct {
 
 // The corresponding interface
 type IBACnetDeviceObjectPropertyReference interface {
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
-	// GetDeviceIdentifier returns DeviceIdentifier
+	// GetDeviceIdentifier returns DeviceIdentifier (property field)
 	GetDeviceIdentifier() *BACnetContextTagObjectIdentifier
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
index 77cf9ed..d46ef54 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetError.go
@@ -35,11 +35,11 @@ type BACnetError struct {
 
 // The corresponding interface
 type IBACnetError interface {
-	// ServiceChoice returns ServiceChoice
-	ServiceChoice() uint8
-	// GetErrorClass returns ErrorClass
+	// GetServiceChoice returns ServiceChoice (discriminator field)
+	GetServiceChoice() uint8
+	// GetErrorClass returns ErrorClass (property field)
 	GetErrorClass() *BACnetApplicationTagEnumerated
-	// GetErrorCode returns ErrorCode
+	// GetErrorCode returns ErrorCode (property field)
 	GetErrorCode() *BACnetApplicationTagEnumerated
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -233,7 +233,7 @@ func (m *BACnetError) SerializeParent(writeBuffer utils.WriteBuffer, child IBACn
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.ServiceChoice())
+	serviceChoice := uint8(child.GetServiceChoice())
 	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
 
 	if _serviceChoiceErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
index fb93bfc..f0442f8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -40,15 +40,13 @@ type BACnetNotificationParameters struct {
 
 // The corresponding interface
 type IBACnetNotificationParameters interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
index a1197cb..68b079b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersBufferReady.go
@@ -43,15 +43,15 @@ type BACnetNotificationParametersBufferReady struct {
 // The corresponding interface
 type IBACnetNotificationParametersBufferReady interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetBufferProperty returns BufferProperty
+	// GetBufferProperty returns BufferProperty (property field)
 	GetBufferProperty() *BACnetDeviceObjectPropertyReference
-	// GetPreviousNotification returns PreviousNotification
+	// GetPreviousNotification returns PreviousNotification (property field)
 	GetPreviousNotification() *BACnetContextTagUnsignedInteger
-	// GetCurrentNotification returns CurrentNotification
+	// GetCurrentNotification returns CurrentNotification (property field)
 	GetCurrentNotification() *BACnetContextTagUnsignedInteger
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -64,13 +64,6 @@ type IBACnetNotificationParametersBufferReady interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersBufferReady) PeekedTagNumber() uint8 {
-	return uint8(10)
-}
-
-func (m *BACnetNotificationParametersBufferReady) GetPeekedTagNumber() uint8 {
-	return uint8(10)
-}
 
 func (m *BACnetNotificationParametersBufferReady) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
index c3cdfd6..d314c7b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfBitString.go
@@ -42,13 +42,13 @@ type BACnetNotificationParametersChangeOfBitString struct {
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfBitString interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetChangeOfBitString returns ChangeOfBitString
+	// GetChangeOfBitString returns ChangeOfBitString (property field)
 	GetChangeOfBitString() *BACnetContextTagBitString
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -61,13 +61,6 @@ type IBACnetNotificationParametersChangeOfBitString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersChangeOfBitString) PeekedTagNumber() uint8 {
-	return uint8(0)
-}
-
-func (m *BACnetNotificationParametersChangeOfBitString) GetPeekedTagNumber() uint8 {
-	return uint8(0)
-}
 
 func (m *BACnetNotificationParametersChangeOfBitString) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
index b98384f..91bf701 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfState.go
@@ -42,13 +42,13 @@ type BACnetNotificationParametersChangeOfState struct {
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfState interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetChangeOfState returns ChangeOfState
+	// GetChangeOfState returns ChangeOfState (property field)
 	GetChangeOfState() *BACnetPropertyStates
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -61,13 +61,6 @@ type IBACnetNotificationParametersChangeOfState interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersChangeOfState) PeekedTagNumber() uint8 {
-	return uint8(1)
-}
-
-func (m *BACnetNotificationParametersChangeOfState) GetPeekedTagNumber() uint8 {
-	return uint8(1)
-}
 
 func (m *BACnetNotificationParametersChangeOfState) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
index 2ff2f67..808d96a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValue.go
@@ -42,13 +42,13 @@ type BACnetNotificationParametersChangeOfValue struct {
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfValue interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetNewValue returns NewValue
+	// GetNewValue returns NewValue (property field)
 	GetNewValue() *BACnetNotificationParametersChangeOfValueNewValue
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -61,13 +61,6 @@ type IBACnetNotificationParametersChangeOfValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersChangeOfValue) PeekedTagNumber() uint8 {
-	return uint8(2)
-}
-
-func (m *BACnetNotificationParametersChangeOfValue) GetPeekedTagNumber() uint8 {
-	return uint8(2)
-}
 
 func (m *BACnetNotificationParametersChangeOfValue) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index 2d66fd1..6467856 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -39,15 +39,13 @@ type BACnetNotificationParametersChangeOfValueNewValue struct {
 
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfValueNewValue interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
index e05067c..91ecdf2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedBits.go
@@ -38,7 +38,7 @@ type BACnetNotificationParametersChangeOfValueNewValueChangedBits struct {
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfValueNewValueChangedBits interface {
 	IBACnetNotificationParametersChangeOfValueNewValue
-	// GetChangedBits returns ChangedBits
+	// GetChangedBits returns ChangedBits (property field)
 	GetChangedBits() *BACnetContextTagBitString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetNotificationParametersChangeOfValueNewValueChangedBits interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) PeekedTagNumber() uint8 {
-	return uint8(0)
-}
-
-func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) GetPeekedTagNumber() uint8 {
-	return uint8(0)
-}
 
 func (m *BACnetNotificationParametersChangeOfValueNewValueChangedBits) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParametersChangeOfValueNewValue.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
index c28d369..b5163a9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValueChangedValue.go
@@ -38,7 +38,7 @@ type BACnetNotificationParametersChangeOfValueNewValueChangedValue struct {
 // The corresponding interface
 type IBACnetNotificationParametersChangeOfValueNewValueChangedValue interface {
 	IBACnetNotificationParametersChangeOfValueNewValue
-	// GetChangedValue returns ChangedValue
+	// GetChangedValue returns ChangedValue (property field)
 	GetChangedValue() *BACnetContextTagReal
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetNotificationParametersChangeOfValueNewValueChangedValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) PeekedTagNumber() uint8 {
-	return uint8(1)
-}
-
-func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) GetPeekedTagNumber() uint8 {
-	return uint8(1)
-}
 
 func (m *BACnetNotificationParametersChangeOfValueNewValueChangedValue) InitializeParent(parent *BACnetNotificationParametersChangeOfValueNewValue, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParametersChangeOfValueNewValue.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
index b9af1f5..2142109 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersComplexEventType.go
@@ -39,7 +39,7 @@ type BACnetNotificationParametersComplexEventType struct {
 // The corresponding interface
 type IBACnetNotificationParametersComplexEventType interface {
 	IBACnetNotificationParameters
-	// GetListOfValues returns ListOfValues
+	// GetListOfValues returns ListOfValues (property field)
 	GetListOfValues() *BACnetPropertyValues
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type IBACnetNotificationParametersComplexEventType interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersComplexEventType) PeekedTagNumber() uint8 {
-	return uint8(6)
-}
-
-func (m *BACnetNotificationParametersComplexEventType) GetPeekedTagNumber() uint8 {
-	return uint8(6)
-}
 
 func (m *BACnetNotificationParametersComplexEventType) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
index d924fff..4cce969 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtended.go
@@ -43,15 +43,15 @@ type BACnetNotificationParametersExtended struct {
 // The corresponding interface
 type IBACnetNotificationParametersExtended interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetVendorId returns VendorId
+	// GetVendorId returns VendorId (property field)
 	GetVendorId() *BACnetContextTagUnsignedInteger
-	// GetExtendedEventType returns ExtendedEventType
+	// GetExtendedEventType returns ExtendedEventType (property field)
 	GetExtendedEventType() *BACnetContextTagUnsignedInteger
-	// GetParameters returns Parameters
+	// GetParameters returns Parameters (property field)
 	GetParameters() *BACnetNotificationParametersExtendedParameters
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -64,13 +64,6 @@ type IBACnetNotificationParametersExtended interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersExtended) PeekedTagNumber() uint8 {
-	return uint8(9)
-}
-
-func (m *BACnetNotificationParametersExtended) GetPeekedTagNumber() uint8 {
-	return uint8(9)
-}
 
 func (m *BACnetNotificationParametersExtended) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index 6a52b3e..0369010 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -52,37 +52,37 @@ type BACnetNotificationParametersExtendedParameters struct {
 
 // The corresponding interface
 type IBACnetNotificationParametersExtendedParameters interface {
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetNullValue returns NullValue
+	// GetNullValue returns NullValue (property field)
 	GetNullValue() *BACnetApplicationTagNull
-	// GetRealValue returns RealValue
+	// GetRealValue returns RealValue (property field)
 	GetRealValue() *BACnetApplicationTagReal
-	// GetUnsignedValue returns UnsignedValue
+	// GetUnsignedValue returns UnsignedValue (property field)
 	GetUnsignedValue() *BACnetApplicationTagUnsignedInteger
-	// GetBooleanValue returns BooleanValue
+	// GetBooleanValue returns BooleanValue (property field)
 	GetBooleanValue() *BACnetApplicationTagBoolean
-	// GetIntegerValue returns IntegerValue
+	// GetIntegerValue returns IntegerValue (property field)
 	GetIntegerValue() *BACnetApplicationTagSignedInteger
-	// GetDoubleValue returns DoubleValue
+	// GetDoubleValue returns DoubleValue (property field)
 	GetDoubleValue() *BACnetApplicationTagDouble
-	// GetOctetStringValue returns OctetStringValue
+	// GetOctetStringValue returns OctetStringValue (property field)
 	GetOctetStringValue() *BACnetApplicationTagOctetString
-	// GetCharacterStringValue returns CharacterStringValue
+	// GetCharacterStringValue returns CharacterStringValue (property field)
 	GetCharacterStringValue() *BACnetApplicationTagCharacterString
-	// GetBitStringValue returns BitStringValue
+	// GetBitStringValue returns BitStringValue (property field)
 	GetBitStringValue() *BACnetApplicationTagBitString
-	// GetEnumeratedValue returns EnumeratedValue
+	// GetEnumeratedValue returns EnumeratedValue (property field)
 	GetEnumeratedValue() *BACnetApplicationTagEnumerated
-	// GetDateValue returns DateValue
+	// GetDateValue returns DateValue (property field)
 	GetDateValue() *BACnetApplicationTagDate
-	// GetTimeValue returns TimeValue
+	// GetTimeValue returns TimeValue (property field)
 	GetTimeValue() *BACnetApplicationTagTime
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetReference returns Reference
+	// GetReference returns Reference (property field)
 	GetReference() *BACnetDeviceObjectPropertyReference
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
index 4f5eabd..8d8ea7e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersFloatingLimit.go
@@ -44,17 +44,17 @@ type BACnetNotificationParametersFloatingLimit struct {
 // The corresponding interface
 type IBACnetNotificationParametersFloatingLimit interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetReferenceValue returns ReferenceValue
+	// GetReferenceValue returns ReferenceValue (property field)
 	GetReferenceValue() *BACnetContextTagReal
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetSetPointValue returns SetPointValue
+	// GetSetPointValue returns SetPointValue (property field)
 	GetSetPointValue() *BACnetContextTagReal
-	// GetErrorLimit returns ErrorLimit
+	// GetErrorLimit returns ErrorLimit (property field)
 	GetErrorLimit() *BACnetContextTagReal
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -67,13 +67,6 @@ type IBACnetNotificationParametersFloatingLimit interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersFloatingLimit) PeekedTagNumber() uint8 {
-	return uint8(4)
-}
-
-func (m *BACnetNotificationParametersFloatingLimit) GetPeekedTagNumber() uint8 {
-	return uint8(4)
-}
 
 func (m *BACnetNotificationParametersFloatingLimit) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
index 107cb47..e216b0b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersOutOfRange.go
@@ -44,17 +44,17 @@ type BACnetNotificationParametersOutOfRange struct {
 // The corresponding interface
 type IBACnetNotificationParametersOutOfRange interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetExceedingValue returns ExceedingValue
+	// GetExceedingValue returns ExceedingValue (property field)
 	GetExceedingValue() *BACnetContextTagReal
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetDeadband returns Deadband
+	// GetDeadband returns Deadband (property field)
 	GetDeadband() *BACnetContextTagReal
-	// GetExceededLimit returns ExceededLimit
+	// GetExceededLimit returns ExceededLimit (property field)
 	GetExceededLimit() *BACnetContextTagReal
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -67,13 +67,6 @@ type IBACnetNotificationParametersOutOfRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersOutOfRange) PeekedTagNumber() uint8 {
-	return uint8(5)
-}
-
-func (m *BACnetNotificationParametersOutOfRange) GetPeekedTagNumber() uint8 {
-	return uint8(5)
-}
 
 func (m *BACnetNotificationParametersOutOfRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
index 241167b..4a71b72 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetNotificationParametersUnsignedRange.go
@@ -43,15 +43,15 @@ type BACnetNotificationParametersUnsignedRange struct {
 // The corresponding interface
 type IBACnetNotificationParametersUnsignedRange interface {
 	IBACnetNotificationParameters
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() *BACnetContextTagUnsignedInteger
-	// GetStatusFlags returns StatusFlags
+	// GetStatusFlags returns StatusFlags (property field)
 	GetStatusFlags() *BACnetStatusFlags
-	// GetExceededLimit returns ExceededLimit
+	// GetExceededLimit returns ExceededLimit (property field)
 	GetExceededLimit() *BACnetContextTagUnsignedInteger
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -64,13 +64,6 @@ type IBACnetNotificationParametersUnsignedRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetNotificationParametersUnsignedRange) PeekedTagNumber() uint8 {
-	return uint8(11)
-}
-
-func (m *BACnetNotificationParametersUnsignedRange) GetPeekedTagNumber() uint8 {
-	return uint8(11)
-}
 
 func (m *BACnetNotificationParametersUnsignedRange) InitializeParent(parent *BACnetNotificationParameters, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetNotificationParameters.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
index a9a63ed..2fcbd44 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyReference.go
@@ -35,9 +35,9 @@ type BACnetPropertyReference struct {
 
 // The corresponding interface
 type IBACnetPropertyReference interface {
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
index def40d2..7e499b7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStates.go
@@ -39,15 +39,13 @@ type BACnetPropertyStates struct {
 
 // The corresponding interface
 type IBACnetPropertyStates interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
index 9db03d1..18e1fa9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesAction.go
@@ -39,7 +39,7 @@ type BACnetPropertyStatesAction struct {
 // The corresponding interface
 type IBACnetPropertyStatesAction interface {
 	IBACnetPropertyStates
-	// GetAction returns Action
+	// GetAction returns Action (property field)
 	GetAction() *BACnetAction
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type IBACnetPropertyStatesAction interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetPropertyStatesAction) PeekedTagNumber() uint8 {
-	return uint8(16)
-}
-
-func (m *BACnetPropertyStatesAction) GetPeekedTagNumber() uint8 {
-	return uint8(16)
-}
 
 func (m *BACnetPropertyStatesAction) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetPropertyStates.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
index c942204..b83d0de 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBinaryValue.go
@@ -39,7 +39,7 @@ type BACnetPropertyStatesBinaryValue struct {
 // The corresponding interface
 type IBACnetPropertyStatesBinaryValue interface {
 	IBACnetPropertyStates
-	// GetBinaryValue returns BinaryValue
+	// GetBinaryValue returns BinaryValue (property field)
 	GetBinaryValue() *BACnetBinaryPV
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type IBACnetPropertyStatesBinaryValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetPropertyStatesBinaryValue) PeekedTagNumber() uint8 {
-	return uint8(1)
-}
-
-func (m *BACnetPropertyStatesBinaryValue) GetPeekedTagNumber() uint8 {
-	return uint8(1)
-}
 
 func (m *BACnetPropertyStatesBinaryValue) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetPropertyStates.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
index 5d91e46..78634f8a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyStatesBoolean.go
@@ -39,7 +39,7 @@ type BACnetPropertyStatesBoolean struct {
 // The corresponding interface
 type IBACnetPropertyStatesBoolean interface {
 	IBACnetPropertyStates
-	// GetBooleanValue returns BooleanValue
+	// GetBooleanValue returns BooleanValue (property field)
 	GetBooleanValue() *BACnetContextTagBoolean
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type IBACnetPropertyStatesBoolean interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetPropertyStatesBoolean) PeekedTagNumber() uint8 {
-	return uint8(0)
-}
-
-func (m *BACnetPropertyStatesBoolean) GetPeekedTagNumber() uint8 {
-	return uint8(0)
-}
 
 func (m *BACnetPropertyStatesBoolean) InitializeParent(parent *BACnetPropertyStates, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetPropertyStates.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
index e5af552..a54e0a7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValue.go
@@ -40,13 +40,13 @@ type BACnetPropertyValue struct {
 
 // The corresponding interface
 type IBACnetPropertyValue interface {
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetPropertyArrayIndex returns PropertyArrayIndex
+	// GetPropertyArrayIndex returns PropertyArrayIndex (property field)
 	GetPropertyArrayIndex() *BACnetContextTagUnsignedInteger
-	// GetPropertyValue returns PropertyValue
+	// GetPropertyValue returns PropertyValue (property field)
 	GetPropertyValue() *BACnetConstructedDataElement
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
index 1d4bcde..0136ce2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetPropertyValues.go
@@ -39,11 +39,11 @@ type BACnetPropertyValues struct {
 
 // The corresponding interface
 type IBACnetPropertyValues interface {
-	// GetInnerOpeningTag returns InnerOpeningTag
+	// GetInnerOpeningTag returns InnerOpeningTag (property field)
 	GetInnerOpeningTag() *BACnetOpeningTag
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []*BACnetPropertyValue
-	// GetInnerClosingTag returns InnerClosingTag
+	// GetInnerClosingTag returns InnerClosingTag (property field)
 	GetInnerClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
index 26c1ade..2cbb85c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetReadAccessSpecification.go
@@ -36,13 +36,13 @@ type BACnetReadAccessSpecification struct {
 
 // The corresponding interface
 type IBACnetReadAccessSpecification interface {
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetListOfPropertyReferences returns ListOfPropertyReferences
+	// GetListOfPropertyReferences returns ListOfPropertyReferences (property field)
 	GetListOfPropertyReferences() []*BACnetPropertyReference
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go
index e49d0d5..7b8e718 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetSegmentation.go
@@ -33,15 +33,15 @@ type BACnetSegmentation struct {
 
 // The corresponding interface
 type IBACnetSegmentation interface {
-	// GetRawData returns RawData
+	// GetRawData returns RawData (property field)
 	GetRawData() *BACnetApplicationTagEnumerated
-	// GetIsSegmentedBoth returns IsSegmentedBoth
+	// GetIsSegmentedBoth returns IsSegmentedBoth (virtual field)
 	GetIsSegmentedBoth() bool
-	// GetIsSegmentedTransmit returns IsSegmentedTransmit
+	// GetIsSegmentedTransmit returns IsSegmentedTransmit (virtual field)
 	GetIsSegmentedTransmit() bool
-	// GetIsSegmentedReceive returns IsSegmentedReceive
+	// GetIsSegmentedReceive returns IsSegmentedReceive (virtual field)
 	GetIsSegmentedReceive() bool
-	// GetIsNoSegmentation returns IsNoSegmentation
+	// GetIsNoSegmentation returns IsNoSegmentation (virtual field)
 	GetIsNoSegmentation() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
index 9af0288..9889181 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAck.go
@@ -33,8 +33,8 @@ type BACnetServiceAck struct {
 
 // The corresponding interface
 type IBACnetServiceAck interface {
-	// ServiceChoice returns ServiceChoice
-	ServiceChoice() uint8
+	// GetServiceChoice returns ServiceChoice (discriminator field)
+	GetServiceChoice() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -174,7 +174,7 @@ func (m *BACnetServiceAck) SerializeParent(writeBuffer utils.WriteBuffer, child
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.ServiceChoice())
+	serviceChoice := uint8(child.GetServiceChoice())
 	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
 
 	if _serviceChoiceErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
index af2d959..c7fe398 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
@@ -36,9 +36,9 @@ type BACnetServiceAckAtomicReadFile struct {
 // The corresponding interface
 type IBACnetServiceAckAtomicReadFile interface {
 	IBACnetServiceAck
-	// GetEndOfFile returns EndOfFile
+	// GetEndOfFile returns EndOfFile (property field)
 	GetEndOfFile() *BACnetApplicationTagBoolean
-	// GetAccessMethod returns AccessMethod
+	// GetAccessMethod returns AccessMethod (property field)
 	GetAccessMethod() *BACnetServiceAckAtomicReadFileStreamOrRecord
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
index 29f77b7..2274dda 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileRecord.go
@@ -37,11 +37,11 @@ type BACnetServiceAckAtomicReadFileRecord struct {
 // The corresponding interface
 type IBACnetServiceAckAtomicReadFileRecord interface {
 	IBACnetServiceAckAtomicReadFileStreamOrRecord
-	// GetFileStartRecord returns FileStartRecord
+	// GetFileStartRecord returns FileStartRecord (property field)
 	GetFileStartRecord() *BACnetApplicationTagSignedInteger
-	// GetReturnedRecordCount returns ReturnedRecordCount
+	// GetReturnedRecordCount returns ReturnedRecordCount (property field)
 	GetReturnedRecordCount() *BACnetApplicationTagUnsignedInteger
-	// GetFileRecordData returns FileRecordData
+	// GetFileRecordData returns FileRecordData (property field)
 	GetFileRecordData() []*BACnetApplicationTagOctetString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -54,13 +54,6 @@ type IBACnetServiceAckAtomicReadFileRecord interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckAtomicReadFileRecord) PeekedTagNumber() uint8 {
-	return 0x1
-}
-
-func (m *BACnetServiceAckAtomicReadFileRecord) GetPeekedTagNumber() uint8 {
-	return 0x1
-}
 
 func (m *BACnetServiceAckAtomicReadFileRecord) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
index 3a1abb5..b841b22 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStream.go
@@ -36,9 +36,9 @@ type BACnetServiceAckAtomicReadFileStream struct {
 // The corresponding interface
 type IBACnetServiceAckAtomicReadFileStream interface {
 	IBACnetServiceAckAtomicReadFileStreamOrRecord
-	// GetFileStartPosition returns FileStartPosition
+	// GetFileStartPosition returns FileStartPosition (property field)
 	GetFileStartPosition() *BACnetApplicationTagSignedInteger
-	// GetFileData returns FileData
+	// GetFileData returns FileData (property field)
 	GetFileData() *BACnetApplicationTagOctetString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetServiceAckAtomicReadFileStream interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckAtomicReadFileStream) PeekedTagNumber() uint8 {
-	return 0x0
-}
-
-func (m *BACnetServiceAckAtomicReadFileStream) GetPeekedTagNumber() uint8 {
-	return 0x0
-}
 
 func (m *BACnetServiceAckAtomicReadFileStream) InitializeParent(parent *BACnetServiceAckAtomicReadFileStreamOrRecord, peekedTagHeader *BACnetTagHeader, openingTag *BACnetOpeningTag, closingTag *BACnetClosingTag) {
 	m.BACnetServiceAckAtomicReadFileStreamOrRecord.PeekedTagHeader = peekedTagHeader
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
index 05660c7..04e3172 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
@@ -36,15 +36,13 @@ type BACnetServiceAckAtomicReadFileStreamOrRecord struct {
 
 // The corresponding interface
 type IBACnetServiceAckAtomicReadFileStreamOrRecord interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index 3c3ad80..be65669 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -35,7 +35,7 @@ type BACnetServiceAckAtomicWriteFile struct {
 // The corresponding interface
 type IBACnetServiceAckAtomicWriteFile interface {
 	IBACnetServiceAck
-	// GetFileStartPosition returns FileStartPosition
+	// GetFileStartPosition returns FileStartPosition (property field)
 	GetFileStartPosition() *BACnetContextTagSignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index 4000dca..df14c02 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -39,13 +39,13 @@ type BACnetServiceAckReadProperty struct {
 // The corresponding interface
 type IBACnetServiceAckReadProperty interface {
 	IBACnetServiceAck
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetPropertyIdentifier returns PropertyIdentifier
+	// GetPropertyIdentifier returns PropertyIdentifier (property field)
 	GetPropertyIdentifier() *BACnetContextTagPropertyIdentifier
-	// GetArrayIndex returns ArrayIndex
+	// GetArrayIndex returns ArrayIndex (property field)
 	GetArrayIndex() *BACnetContextTagUnsignedInteger
-	// GetValues returns Values
+	// GetValues returns Values (property field)
 	GetValues() *BACnetConstructedData
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
index e0d146c..24f45a2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetStatusFlags.go
@@ -36,15 +36,15 @@ type BACnetStatusFlags struct {
 
 // The corresponding interface
 type IBACnetStatusFlags interface {
-	// GetRawBits returns RawBits
+	// GetRawBits returns RawBits (property field)
 	GetRawBits() *BACnetContextTagBitString
-	// GetInAlarm returns InAlarm
+	// GetInAlarm returns InAlarm (virtual field)
 	GetInAlarm() bool
-	// GetFault returns Fault
+	// GetFault returns Fault (virtual field)
 	GetFault() bool
-	// GetOverriden returns Overriden
+	// GetOverriden returns Overriden (virtual field)
 	GetOverriden() bool
-	// GetOutOfService returns OutOfService
+	// GetOutOfService returns OutOfService (virtual field)
 	GetOutOfService() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go
index d9c711c..5087d9e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagHeader.go
@@ -39,29 +39,29 @@ type BACnetTagHeader struct {
 
 // The corresponding interface
 type IBACnetTagHeader interface {
-	// GetTagNumber returns TagNumber
+	// GetTagNumber returns TagNumber (property field)
 	GetTagNumber() uint8
-	// GetTagClass returns TagClass
+	// GetTagClass returns TagClass (property field)
 	GetTagClass() TagClass
-	// GetLengthValueType returns LengthValueType
+	// GetLengthValueType returns LengthValueType (property field)
 	GetLengthValueType() uint8
-	// GetExtTagNumber returns ExtTagNumber
+	// GetExtTagNumber returns ExtTagNumber (property field)
 	GetExtTagNumber() *uint8
-	// GetExtLength returns ExtLength
+	// GetExtLength returns ExtLength (property field)
 	GetExtLength() *uint8
-	// GetExtExtLength returns ExtExtLength
+	// GetExtExtLength returns ExtExtLength (property field)
 	GetExtExtLength() *uint16
-	// GetExtExtExtLength returns ExtExtExtLength
+	// GetExtExtExtLength returns ExtExtExtLength (property field)
 	GetExtExtExtLength() *uint32
-	// GetActualTagNumber returns ActualTagNumber
+	// GetActualTagNumber returns ActualTagNumber (virtual field)
 	GetActualTagNumber() uint8
-	// GetIsBoolean returns IsBoolean
+	// GetIsBoolean returns IsBoolean (virtual field)
 	GetIsBoolean() bool
-	// GetIsConstructed returns IsConstructed
+	// GetIsConstructed returns IsConstructed (virtual field)
 	GetIsConstructed() bool
-	// GetIsPrimitiveAndNotBoolean returns IsPrimitiveAndNotBoolean
+	// GetIsPrimitiveAndNotBoolean returns IsPrimitiveAndNotBoolean (virtual field)
 	GetIsPrimitiveAndNotBoolean() bool
-	// GetActualLength returns ActualLength
+	// GetActualLength returns ActualLength (virtual field)
 	GetActualLength() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
index 315304e..661c190 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBitString.go
@@ -38,11 +38,11 @@ type BACnetTagPayloadBitString struct {
 
 // The corresponding interface
 type IBACnetTagPayloadBitString interface {
-	// GetUnusedBits returns UnusedBits
+	// GetUnusedBits returns UnusedBits (property field)
 	GetUnusedBits() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []bool
-	// GetUnused returns Unused
+	// GetUnused returns Unused (property field)
 	GetUnused() []bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
index 2822a9d..ea3fddf 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadBoolean.go
@@ -35,11 +35,11 @@ type BACnetTagPayloadBoolean struct {
 
 // The corresponding interface
 type IBACnetTagPayloadBoolean interface {
-	// GetValue returns Value
+	// GetValue returns Value (virtual field)
 	GetValue() bool
-	// GetIsTrue returns IsTrue
+	// GetIsTrue returns IsTrue (virtual field)
 	GetIsTrue() bool
-	// GetIsFalse returns IsFalse
+	// GetIsFalse returns IsFalse (virtual field)
 	GetIsFalse() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
index 4134cc2..d937602 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadCharacterString.go
@@ -37,11 +37,11 @@ type BACnetTagPayloadCharacterString struct {
 
 // The corresponding interface
 type IBACnetTagPayloadCharacterString interface {
-	// GetEncoding returns Encoding
+	// GetEncoding returns Encoding (property field)
 	GetEncoding() BACnetCharacterEncoding
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() string
-	// GetActualLengthInBit returns ActualLengthInBit
+	// GetActualLengthInBit returns ActualLengthInBit (virtual field)
 	GetActualLengthInBit() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go
index 77bc011..8b13ccd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDate.go
@@ -36,35 +36,35 @@ type BACnetTagPayloadDate struct {
 
 // The corresponding interface
 type IBACnetTagPayloadDate interface {
-	// GetYearMinus1900 returns YearMinus1900
+	// GetYearMinus1900 returns YearMinus1900 (property field)
 	GetYearMinus1900() uint8
-	// GetMonth returns Month
+	// GetMonth returns Month (property field)
 	GetMonth() uint8
-	// GetDayOfMonth returns DayOfMonth
+	// GetDayOfMonth returns DayOfMonth (property field)
 	GetDayOfMonth() uint8
-	// GetDayOfWeek returns DayOfWeek
+	// GetDayOfWeek returns DayOfWeek (property field)
 	GetDayOfWeek() uint8
-	// GetWildcard returns Wildcard
+	// GetWildcard returns Wildcard (virtual field)
 	GetWildcard() uint8
-	// GetYearIsWildcard returns YearIsWildcard
+	// GetYearIsWildcard returns YearIsWildcard (virtual field)
 	GetYearIsWildcard() bool
-	// GetYear returns Year
+	// GetYear returns Year (virtual field)
 	GetYear() uint16
-	// GetMonthIsWildcard returns MonthIsWildcard
+	// GetMonthIsWildcard returns MonthIsWildcard (virtual field)
 	GetMonthIsWildcard() bool
-	// GetOddMonthWildcard returns OddMonthWildcard
+	// GetOddMonthWildcard returns OddMonthWildcard (virtual field)
 	GetOddMonthWildcard() bool
-	// GetEvenMonthWildcard returns EvenMonthWildcard
+	// GetEvenMonthWildcard returns EvenMonthWildcard (virtual field)
 	GetEvenMonthWildcard() bool
-	// GetDayOfMonthIsWildcard returns DayOfMonthIsWildcard
+	// GetDayOfMonthIsWildcard returns DayOfMonthIsWildcard (virtual field)
 	GetDayOfMonthIsWildcard() bool
-	// GetLastDayOfMonthWildcard returns LastDayOfMonthWildcard
+	// GetLastDayOfMonthWildcard returns LastDayOfMonthWildcard (virtual field)
 	GetLastDayOfMonthWildcard() bool
-	// GetOddDayOfMonthWildcard returns OddDayOfMonthWildcard
+	// GetOddDayOfMonthWildcard returns OddDayOfMonthWildcard (virtual field)
 	GetOddDayOfMonthWildcard() bool
-	// GetEvenDayOfMonthWildcard returns EvenDayOfMonthWildcard
+	// GetEvenDayOfMonthWildcard returns EvenDayOfMonthWildcard (virtual field)
 	GetEvenDayOfMonthWildcard() bool
-	// GetDayOfWeekIsWildcard returns DayOfWeekIsWildcard
+	// GetDayOfWeekIsWildcard returns DayOfWeekIsWildcard (virtual field)
 	GetDayOfWeekIsWildcard() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
index 9eacdfd..2317086 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadDouble.go
@@ -33,7 +33,7 @@ type BACnetTagPayloadDouble struct {
 
 // The corresponding interface
 type IBACnetTagPayloadDouble interface {
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() float64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
index 815c0cb..e7e95c0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadEnumerated.go
@@ -36,9 +36,9 @@ type BACnetTagPayloadEnumerated struct {
 
 // The corresponding interface
 type IBACnetTagPayloadEnumerated interface {
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
index 08d34a7..72fbd2c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadObjectIdentifier.go
@@ -35,13 +35,13 @@ type BACnetTagPayloadObjectIdentifier struct {
 
 // The corresponding interface
 type IBACnetTagPayloadObjectIdentifier interface {
-	// GetObjectType returns ObjectType
+	// GetObjectType returns ObjectType (property field)
 	GetObjectType() BACnetObjectType
-	// GetProprietaryValue returns ProprietaryValue
+	// GetProprietaryValue returns ProprietaryValue (property field)
 	GetProprietaryValue() uint16
-	// GetInstanceNumber returns InstanceNumber
+	// GetInstanceNumber returns InstanceNumber (property field)
 	GetInstanceNumber() uint32
-	// GetIsProprietary returns IsProprietary
+	// GetIsProprietary returns IsProprietary (virtual field)
 	GetIsProprietary() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
index d0a7077..72faf9b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadOctetString.go
@@ -36,9 +36,9 @@ type BACnetTagPayloadOctetString struct {
 
 // The corresponding interface
 type IBACnetTagPayloadOctetString interface {
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() string
-	// GetActualLengthInBit returns ActualLengthInBit
+	// GetActualLengthInBit returns ActualLengthInBit (virtual field)
 	GetActualLengthInBit() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go
index bc9c9d8..6a9dd01 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadReal.go
@@ -33,7 +33,7 @@ type BACnetTagPayloadReal struct {
 
 // The corresponding interface
 type IBACnetTagPayloadReal interface {
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() float32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
index 93f1bae..f763f32 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadSignedInteger.go
@@ -43,39 +43,39 @@ type BACnetTagPayloadSignedInteger struct {
 
 // The corresponding interface
 type IBACnetTagPayloadSignedInteger interface {
-	// GetValueInt8 returns ValueInt8
+	// GetValueInt8 returns ValueInt8 (property field)
 	GetValueInt8() *int8
-	// GetValueInt16 returns ValueInt16
+	// GetValueInt16 returns ValueInt16 (property field)
 	GetValueInt16() *int16
-	// GetValueInt24 returns ValueInt24
+	// GetValueInt24 returns ValueInt24 (property field)
 	GetValueInt24() *int32
-	// GetValueInt32 returns ValueInt32
+	// GetValueInt32 returns ValueInt32 (property field)
 	GetValueInt32() *int32
-	// GetValueInt40 returns ValueInt40
+	// GetValueInt40 returns ValueInt40 (property field)
 	GetValueInt40() *int64
-	// GetValueInt48 returns ValueInt48
+	// GetValueInt48 returns ValueInt48 (property field)
 	GetValueInt48() *int64
-	// GetValueInt56 returns ValueInt56
+	// GetValueInt56 returns ValueInt56 (property field)
 	GetValueInt56() *int64
-	// GetValueInt64 returns ValueInt64
+	// GetValueInt64 returns ValueInt64 (property field)
 	GetValueInt64() *int64
-	// GetIsInt8 returns IsInt8
+	// GetIsInt8 returns IsInt8 (virtual field)
 	GetIsInt8() bool
-	// GetIsInt16 returns IsInt16
+	// GetIsInt16 returns IsInt16 (virtual field)
 	GetIsInt16() bool
-	// GetIsInt24 returns IsInt24
+	// GetIsInt24 returns IsInt24 (virtual field)
 	GetIsInt24() bool
-	// GetIsInt32 returns IsInt32
+	// GetIsInt32 returns IsInt32 (virtual field)
 	GetIsInt32() bool
-	// GetIsInt40 returns IsInt40
+	// GetIsInt40 returns IsInt40 (virtual field)
 	GetIsInt40() bool
-	// GetIsInt48 returns IsInt48
+	// GetIsInt48 returns IsInt48 (virtual field)
 	GetIsInt48() bool
-	// GetIsInt56 returns IsInt56
+	// GetIsInt56 returns IsInt56 (virtual field)
 	GetIsInt56() bool
-	// GetIsInt64 returns IsInt64
+	// GetIsInt64 returns IsInt64 (virtual field)
 	GetIsInt64() bool
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go
index 6ab8cd0..8f29770 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadTime.go
@@ -36,23 +36,23 @@ type BACnetTagPayloadTime struct {
 
 // The corresponding interface
 type IBACnetTagPayloadTime interface {
-	// GetHour returns Hour
+	// GetHour returns Hour (property field)
 	GetHour() uint8
-	// GetMinute returns Minute
+	// GetMinute returns Minute (property field)
 	GetMinute() uint8
-	// GetSecond returns Second
+	// GetSecond returns Second (property field)
 	GetSecond() uint8
-	// GetFractional returns Fractional
+	// GetFractional returns Fractional (property field)
 	GetFractional() uint8
-	// GetWildcard returns Wildcard
+	// GetWildcard returns Wildcard (virtual field)
 	GetWildcard() uint8
-	// GetHourIsWildcard returns HourIsWildcard
+	// GetHourIsWildcard returns HourIsWildcard (virtual field)
 	GetHourIsWildcard() bool
-	// GetMinuteIsWildcard returns MinuteIsWildcard
+	// GetMinuteIsWildcard returns MinuteIsWildcard (virtual field)
 	GetMinuteIsWildcard() bool
-	// GetSecondIsWildcard returns SecondIsWildcard
+	// GetSecondIsWildcard returns SecondIsWildcard (virtual field)
 	GetSecondIsWildcard() bool
-	// GetFractionalIsWildcard returns FractionalIsWildcard
+	// GetFractionalIsWildcard returns FractionalIsWildcard (virtual field)
 	GetFractionalIsWildcard() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
index 241d095..aefac24 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagPayloadUnsignedInteger.go
@@ -43,39 +43,39 @@ type BACnetTagPayloadUnsignedInteger struct {
 
 // The corresponding interface
 type IBACnetTagPayloadUnsignedInteger interface {
-	// GetValueUint8 returns ValueUint8
+	// GetValueUint8 returns ValueUint8 (property field)
 	GetValueUint8() *uint8
-	// GetValueUint16 returns ValueUint16
+	// GetValueUint16 returns ValueUint16 (property field)
 	GetValueUint16() *uint16
-	// GetValueUint24 returns ValueUint24
+	// GetValueUint24 returns ValueUint24 (property field)
 	GetValueUint24() *uint32
-	// GetValueUint32 returns ValueUint32
+	// GetValueUint32 returns ValueUint32 (property field)
 	GetValueUint32() *uint32
-	// GetValueUint40 returns ValueUint40
+	// GetValueUint40 returns ValueUint40 (property field)
 	GetValueUint40() *uint64
-	// GetValueUint48 returns ValueUint48
+	// GetValueUint48 returns ValueUint48 (property field)
 	GetValueUint48() *uint64
-	// GetValueUint56 returns ValueUint56
+	// GetValueUint56 returns ValueUint56 (property field)
 	GetValueUint56() *uint64
-	// GetValueUint64 returns ValueUint64
+	// GetValueUint64 returns ValueUint64 (property field)
 	GetValueUint64() *uint64
-	// GetIsUint8 returns IsUint8
+	// GetIsUint8 returns IsUint8 (virtual field)
 	GetIsUint8() bool
-	// GetIsUint16 returns IsUint16
+	// GetIsUint16 returns IsUint16 (virtual field)
 	GetIsUint16() bool
-	// GetIsUint24 returns IsUint24
+	// GetIsUint24 returns IsUint24 (virtual field)
 	GetIsUint24() bool
-	// GetIsUint32 returns IsUint32
+	// GetIsUint32 returns IsUint32 (virtual field)
 	GetIsUint32() bool
-	// GetIsUint40 returns IsUint40
+	// GetIsUint40 returns IsUint40 (virtual field)
 	GetIsUint40() bool
-	// GetIsUint48 returns IsUint48
+	// GetIsUint48 returns IsUint48 (virtual field)
 	GetIsUint48() bool
-	// GetIsUint56 returns IsUint56
+	// GetIsUint56 returns IsUint56 (virtual field)
 	GetIsUint56() bool
-	// GetIsUint64 returns IsUint64
+	// GetIsUint64 returns IsUint64 (virtual field)
 	GetIsUint64() bool
-	// GetActualValue returns ActualValue
+	// GetActualValue returns ActualValue (virtual field)
 	GetActualValue() uint64
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
index 2618b0b..1627d25 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStamp.go
@@ -39,15 +39,13 @@ type BACnetTimeStamp struct {
 
 // The corresponding interface
 type IBACnetTimeStamp interface {
-	// PeekedTagNumber returns PeekedTagNumber
-	PeekedTagNumber() uint8
-	// GetOpeningTag returns OpeningTag
+	// GetOpeningTag returns OpeningTag (property field)
 	GetOpeningTag() *BACnetOpeningTag
-	// GetPeekedTagHeader returns PeekedTagHeader
+	// GetPeekedTagHeader returns PeekedTagHeader (property field)
 	GetPeekedTagHeader() *BACnetTagHeader
-	// GetClosingTag returns ClosingTag
+	// GetClosingTag returns ClosingTag (property field)
 	GetClosingTag() *BACnetClosingTag
-	// GetPeekedTagNumber returns PeekedTagNumber
+	// GetPeekedTagNumber returns PeekedTagNumber (virtual field)
 	GetPeekedTagNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
index 70ba088..e74d801 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampDateTime.go
@@ -38,7 +38,7 @@ type BACnetTimeStampDateTime struct {
 // The corresponding interface
 type IBACnetTimeStampDateTime interface {
 	IBACnetTimeStamp
-	// GetDateTimeValue returns DateTimeValue
+	// GetDateTimeValue returns DateTimeValue (property field)
 	GetDateTimeValue() *BACnetDateTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetTimeStampDateTime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetTimeStampDateTime) PeekedTagNumber() uint8 {
-	return uint8(2)
-}
-
-func (m *BACnetTimeStampDateTime) GetPeekedTagNumber() uint8 {
-	return uint8(2)
-}
 
 func (m *BACnetTimeStampDateTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetTimeStamp.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
index ad3a948..577309b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampSequence.go
@@ -38,7 +38,7 @@ type BACnetTimeStampSequence struct {
 // The corresponding interface
 type IBACnetTimeStampSequence interface {
 	IBACnetTimeStamp
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetTimeStampSequence interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetTimeStampSequence) PeekedTagNumber() uint8 {
-	return uint8(1)
-}
-
-func (m *BACnetTimeStampSequence) GetPeekedTagNumber() uint8 {
-	return uint8(1)
-}
 
 func (m *BACnetTimeStampSequence) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetTimeStamp.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
index 1309980..ef6cd16 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTimeStampTime.go
@@ -38,7 +38,7 @@ type BACnetTimeStampTime struct {
 // The corresponding interface
 type IBACnetTimeStampTime interface {
 	IBACnetTimeStamp
-	// GetTimeValue returns TimeValue
+	// GetTimeValue returns TimeValue (property field)
 	GetTimeValue() *BACnetContextTagTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type IBACnetTimeStampTime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetTimeStampTime) PeekedTagNumber() uint8 {
-	return uint8(0)
-}
-
-func (m *BACnetTimeStampTime) GetPeekedTagNumber() uint8 {
-	return uint8(0)
-}
 
 func (m *BACnetTimeStampTime) InitializeParent(parent *BACnetTimeStamp, openingTag *BACnetOpeningTag, peekedTagHeader *BACnetTagHeader, closingTag *BACnetClosingTag) {
 	m.BACnetTimeStamp.OpeningTag = openingTag
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
index 4d5842d..16e2961 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
@@ -36,8 +36,8 @@ type BACnetUnconfirmedServiceRequest struct {
 
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequest interface {
-	// ServiceChoice returns ServiceChoice
-	ServiceChoice() uint8
+	// GetServiceChoice returns ServiceChoice (discriminator field)
+	GetServiceChoice() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -175,7 +175,7 @@ func (m *BACnetUnconfirmedServiceRequest) SerializeParent(writeBuffer utils.Writ
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.ServiceChoice())
+	serviceChoice := uint8(child.GetServiceChoice())
 	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
 
 	if _serviceChoiceErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index 39d3a8e..c4a8425 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -41,13 +41,13 @@ type BACnetUnconfirmedServiceRequestIAm struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestIAm interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetDeviceIdentifier returns DeviceIdentifier
+	// GetDeviceIdentifier returns DeviceIdentifier (property field)
 	GetDeviceIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetMaximumApduLengthAcceptedLength returns MaximumApduLengthAcceptedLength
+	// GetMaximumApduLengthAcceptedLength returns MaximumApduLengthAcceptedLength (property field)
 	GetMaximumApduLengthAcceptedLength() *BACnetApplicationTagUnsignedInteger
-	// GetSegmentationSupported returns SegmentationSupported
+	// GetSegmentationSupported returns SegmentationSupported (property field)
 	GetSegmentationSupported() *BACnetSegmentation
-	// GetVendorId returns VendorId
+	// GetVendorId returns VendorId (property field)
 	GetVendorId() *BACnetApplicationTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
index 0c00e0c..efaea95 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
@@ -40,11 +40,11 @@ type BACnetUnconfirmedServiceRequestIHave struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestIHave interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetDeviceIdentifier returns DeviceIdentifier
+	// GetDeviceIdentifier returns DeviceIdentifier (property field)
 	GetDeviceIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetApplicationTagObjectIdentifier
-	// GetObjectName returns ObjectName
+	// GetObjectName returns ObjectName (property field)
 	GetObjectName() *BACnetApplicationTagCharacterString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
index eb883ed..b63f479 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
@@ -39,9 +39,9 @@ type BACnetUnconfirmedServiceRequestTimeSynchronization struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestTimeSynchronization interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetSynchronizedDate returns SynchronizedDate
+	// GetSynchronizedDate returns SynchronizedDate (property field)
 	GetSynchronizedDate() *BACnetApplicationTagDate
-	// GetSynchronizedTime returns SynchronizedTime
+	// GetSynchronizedTime returns SynchronizedTime (property field)
 	GetSynchronizedTime() *BACnetApplicationTagTime
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index 84c5362..bf0c9ca 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -42,15 +42,15 @@ type BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier
+	// GetSubscriberProcessIdentifier returns SubscriberProcessIdentifier (property field)
 	GetSubscriberProcessIdentifier() *BACnetContextTagUnsignedInteger
-	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier
+	// GetInitiatingDeviceIdentifier returns InitiatingDeviceIdentifier (property field)
 	GetInitiatingDeviceIdentifier() *BACnetContextTagObjectIdentifier
-	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier
+	// GetMonitoredObjectIdentifier returns MonitoredObjectIdentifier (property field)
 	GetMonitoredObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetLifetimeInSeconds returns LifetimeInSeconds
+	// GetLifetimeInSeconds returns LifetimeInSeconds (property field)
 	GetLifetimeInSeconds() *BACnetContextTagUnsignedInteger
-	// GetListOfValues returns ListOfValues
+	// GetListOfValues returns ListOfValues (property field)
 	GetListOfValues() *BACnetPropertyValues
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index dc0a25d..34b2643 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -41,11 +41,11 @@ type BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetVendorId returns VendorId
+	// GetVendorId returns VendorId (property field)
 	GetVendorId() *BACnetContextTagUnsignedInteger
-	// GetServiceNumber returns ServiceNumber
+	// GetServiceNumber returns ServiceNumber (property field)
 	GetServiceNumber() *BACnetContextTagUnsignedInteger
-	// GetServiceParameters returns ServiceParameters
+	// GetServiceParameters returns ServiceParameters (property field)
 	GetServiceParameters() *BACnetPropertyValues
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
index 5be7137..a90343c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
@@ -38,7 +38,7 @@ type BACnetUnconfirmedServiceRequestUnconfirmedUnknown struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestUnconfirmedUnknown interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetUnknownBytes returns UnknownBytes
+	// GetUnknownBytes returns UnknownBytes (property field)
 	GetUnknownBytes() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index a169a9b..10c4d3d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -42,13 +42,13 @@ type BACnetUnconfirmedServiceRequestWhoHas struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestWhoHas interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetDeviceInstanceRangeLowLimit returns DeviceInstanceRangeLowLimit
+	// GetDeviceInstanceRangeLowLimit returns DeviceInstanceRangeLowLimit (property field)
 	GetDeviceInstanceRangeLowLimit() *BACnetContextTagUnsignedInteger
-	// GetDeviceInstanceRangeHighLimit returns DeviceInstanceRangeHighLimit
+	// GetDeviceInstanceRangeHighLimit returns DeviceInstanceRangeHighLimit (property field)
 	GetDeviceInstanceRangeHighLimit() *BACnetContextTagUnsignedInteger
-	// GetObjectIdentifier returns ObjectIdentifier
+	// GetObjectIdentifier returns ObjectIdentifier (property field)
 	GetObjectIdentifier() *BACnetContextTagObjectIdentifier
-	// GetObjectName returns ObjectName
+	// GetObjectName returns ObjectName (property field)
 	GetObjectName() *BACnetContextTagOctetString
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index 004194b..ac89ed8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -40,9 +40,9 @@ type BACnetUnconfirmedServiceRequestWhoIs struct {
 // The corresponding interface
 type IBACnetUnconfirmedServiceRequestWhoIs interface {
 	IBACnetUnconfirmedServiceRequest
-	// GetDeviceInstanceRangeLowLimit returns DeviceInstanceRangeLowLimit
+	// GetDeviceInstanceRangeLowLimit returns DeviceInstanceRangeLowLimit (property field)
 	GetDeviceInstanceRangeLowLimit() *BACnetContextTagUnsignedInteger
-	// GetDeviceInstanceRangeHighLimit returns DeviceInstanceRangeHighLimit
+	// GetDeviceInstanceRangeHighLimit returns DeviceInstanceRangeHighLimit (property field)
 	GetDeviceInstanceRangeHighLimit() *BACnetContextTagUnsignedInteger
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
index e28fba8..fcc0e4f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLC.go
@@ -37,9 +37,9 @@ type BVLC struct {
 
 // The corresponding interface
 type IBVLC interface {
-	// BvlcFunction returns BvlcFunction
-	BvlcFunction() uint8
-	// GetBvlcPayloadLength returns BvlcPayloadLength
+	// GetBvlcFunction returns BvlcFunction (discriminator field)
+	GetBvlcFunction() uint8
+	// GetBvlcPayloadLength returns BvlcPayloadLength (virtual field)
 	GetBvlcPayloadLength() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -216,7 +216,7 @@ func (m *BVLC) SerializeParent(writeBuffer utils.WriteBuffer, child IBVLC, seria
 	}
 
 	// Discriminator Field (bvlcFunction) (Used as input to a switch field)
-	bvlcFunction := uint8(child.BvlcFunction())
+	bvlcFunction := uint8(child.GetBvlcFunction())
 	_bvlcFunctionErr := writeBuffer.WriteUint8("bvlcFunction", 8, (bvlcFunction))
 
 	if _bvlcFunctionErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
index 9d90682..c8b4d60 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
@@ -38,7 +38,7 @@ type BVLCDistributeBroadcastToNetwork struct {
 // The corresponding interface
 type IBVLCDistributeBroadcastToNetwork interface {
 	IBVLC
-	// GetNpdu returns Npdu
+	// GetNpdu returns Npdu (property field)
 	GetNpdu() *NPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index c45e365..ea5add6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -40,11 +40,11 @@ type BVLCForwardedNPDU struct {
 // The corresponding interface
 type IBVLCForwardedNPDU interface {
 	IBVLC
-	// GetIp returns Ip
+	// GetIp returns Ip (property field)
 	GetIp() []uint8
-	// GetPort returns Port
+	// GetPort returns Port (property field)
 	GetPort() uint16
-	// GetNpdu returns Npdu
+	// GetNpdu returns Npdu (property field)
 	GetNpdu() *NPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index 000a7be..4f67db8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -38,7 +38,7 @@ type BVLCOriginalBroadcastNPDU struct {
 // The corresponding interface
 type IBVLCOriginalBroadcastNPDU interface {
 	IBVLC
-	// GetNpdu returns Npdu
+	// GetNpdu returns Npdu (property field)
 	GetNpdu() *NPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index 62f9488..9e476ba 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -38,7 +38,7 @@ type BVLCOriginalUnicastNPDU struct {
 // The corresponding interface
 type IBVLCOriginalUnicastNPDU interface {
 	IBVLC
-	// GetNpdu returns Npdu
+	// GetNpdu returns Npdu (property field)
 	GetNpdu() *NPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
index 7ceb221..d48aad8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
@@ -35,7 +35,7 @@ type BVLCRegisterForeignDevice struct {
 // The corresponding interface
 type IBVLCRegisterForeignDevice interface {
 	IBVLC
-	// GetTtl returns Ttl
+	// GetTtl returns Ttl (property field)
 	GetTtl() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
index 90f5729..9973e15 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
@@ -35,7 +35,7 @@ type BVLCResult struct {
 // The corresponding interface
 type IBVLCResult interface {
 	IBVLC
-	// GetCode returns Code
+	// GetCode returns Code (property field)
 	GetCode() BVLCResultCode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
index 665be9e..de5a492 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
@@ -38,7 +38,7 @@ type BVLCWriteBroadcastDistributionTable struct {
 // The corresponding interface
 type IBVLCWriteBroadcastDistributionTable interface {
 	IBVLC
-	// GetTable returns Table
+	// GetTable returns Table (property field)
 	GetTable() []*BVLCWriteBroadcastDistributionTableEntry
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go
index e7f0003..3e9e379 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTableEntry.go
@@ -35,11 +35,11 @@ type BVLCWriteBroadcastDistributionTableEntry struct {
 
 // The corresponding interface
 type IBVLCWriteBroadcastDistributionTableEntry interface {
-	// GetIp returns Ip
+	// GetIp returns Ip (property field)
 	GetIp() []uint8
-	// GetPort returns Port
+	// GetPort returns Port (property field)
 	GetPort() uint16
-	// GetBroadcastDistributionMap returns BroadcastDistributionMap
+	// GetBroadcastDistributionMap returns BroadcastDistributionMap (property field)
 	GetBroadcastDistributionMap() []uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
index c88711e..2d54158 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
@@ -37,9 +37,9 @@ type NLM struct {
 
 // The corresponding interface
 type INLM interface {
-	// MessageType returns MessageType
-	MessageType() uint8
-	// GetVendorId returns VendorId
+	// GetMessageType returns MessageType (discriminator field)
+	GetMessageType() uint8
+	// GetVendorId returns VendorId (property field)
 	GetVendorId() *uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -190,7 +190,7 @@ func (m *NLM) SerializeParent(writeBuffer utils.WriteBuffer, child INLM, seriali
 	}
 
 	// Discriminator Field (messageType) (Used as input to a switch field)
-	messageType := uint8(child.MessageType())
+	messageType := uint8(child.GetMessageType())
 	_messageTypeErr := writeBuffer.WriteUint8("messageType", 8, (messageType))
 
 	if _messageTypeErr != nil {
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
index fd9f88f..e60fd2a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
@@ -38,7 +38,7 @@ type NLMDisconnectConnectionToNetwork struct {
 // The corresponding interface
 type INLMDisconnectConnectionToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
index 2d32da0..a3769d4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
@@ -39,9 +39,9 @@ type NLMEstablishConnectionToNetwork struct {
 // The corresponding interface
 type INLMEstablishConnectionToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() uint16
-	// GetTerminationTime returns TerminationTime
+	// GetTerminationTime returns TerminationTime (property field)
 	GetTerminationTime() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index 0b37485..e3af778 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -38,7 +38,7 @@ type NLMIAmRouterToNetwork struct {
 // The corresponding interface
 type INLMIAmRouterToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() []uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
index 805e21a..8e4bc09 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
@@ -39,9 +39,9 @@ type NLMICouldBeRouterToNetwork struct {
 // The corresponding interface
 type INLMICouldBeRouterToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() uint16
-	// GetPerformanceIndex returns PerformanceIndex
+	// GetPerformanceIndex returns PerformanceIndex (property field)
 	GetPerformanceIndex() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
index 99e3f66..94a61e8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
@@ -39,9 +39,9 @@ type NLMInitalizeRoutingTable struct {
 // The corresponding interface
 type INLMInitalizeRoutingTable interface {
 	INLM
-	// GetNumberOfPorts returns NumberOfPorts
+	// GetNumberOfPorts returns NumberOfPorts (property field)
 	GetNumberOfPorts() uint8
-	// GetPortMappings returns PortMappings
+	// GetPortMappings returns PortMappings (property field)
 	GetPortMappings() []*NLMInitalizeRoutingTablePortMapping
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
index 050c32d..049db76 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
@@ -39,9 +39,9 @@ type NLMInitalizeRoutingTableAck struct {
 // The corresponding interface
 type INLMInitalizeRoutingTableAck interface {
 	INLM
-	// GetNumberOfPorts returns NumberOfPorts
+	// GetNumberOfPorts returns NumberOfPorts (property field)
 	GetNumberOfPorts() uint8
-	// GetPortMappings returns PortMappings
+	// GetPortMappings returns PortMappings (property field)
 	GetPortMappings() []*NLMInitalizeRoutingTablePortMapping
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go
index b6d6c9a..314f34d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTablePortMapping.go
@@ -36,13 +36,13 @@ type NLMInitalizeRoutingTablePortMapping struct {
 
 // The corresponding interface
 type INLMInitalizeRoutingTablePortMapping interface {
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() uint16
-	// GetPortId returns PortId
+	// GetPortId returns PortId (property field)
 	GetPortId() uint8
-	// GetPortInfoLength returns PortInfoLength
+	// GetPortInfoLength returns PortInfoLength (property field)
 	GetPortInfoLength() uint8
-	// GetPortInfo returns PortInfo
+	// GetPortInfo returns PortInfo (property field)
 	GetPortInfo() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
index 74b9105..ffbe72e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
@@ -39,9 +39,9 @@ type NLMRejectRouterToNetwork struct {
 // The corresponding interface
 type INLMRejectRouterToNetwork interface {
 	INLM
-	// GetRejectReason returns RejectReason
+	// GetRejectReason returns RejectReason (property field)
 	GetRejectReason() NLMRejectRouterToNetworkRejectReason
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
index abaeb9d..300b95c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
@@ -38,7 +38,7 @@ type NLMRouterAvailableToNetwork struct {
 // The corresponding interface
 type INLMRouterAvailableToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() []uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
index fa22cac..2d4e419 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
@@ -38,7 +38,7 @@ type NLMRouterBusyToNetwork struct {
 // The corresponding interface
 type INLMRouterBusyToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() []uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index 926e851..ecd7404 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -38,7 +38,7 @@ type NLMWhoIsRouterToNetwork struct {
 // The corresponding interface
 type INLMWhoIsRouterToNetwork interface {
 	INLM
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() []uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
index fb10814..e713a59 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
@@ -47,33 +47,33 @@ type NPDU struct {
 
 // The corresponding interface
 type INPDU interface {
-	// GetProtocolVersionNumber returns ProtocolVersionNumber
+	// GetProtocolVersionNumber returns ProtocolVersionNumber (property field)
 	GetProtocolVersionNumber() uint8
-	// GetControl returns Control
+	// GetControl returns Control (property field)
 	GetControl() *NPDUControl
-	// GetDestinationNetworkAddress returns DestinationNetworkAddress
+	// GetDestinationNetworkAddress returns DestinationNetworkAddress (property field)
 	GetDestinationNetworkAddress() *uint16
-	// GetDestinationLength returns DestinationLength
+	// GetDestinationLength returns DestinationLength (property field)
 	GetDestinationLength() *uint8
-	// GetDestinationAddress returns DestinationAddress
+	// GetDestinationAddress returns DestinationAddress (property field)
 	GetDestinationAddress() []uint8
-	// GetSourceNetworkAddress returns SourceNetworkAddress
+	// GetSourceNetworkAddress returns SourceNetworkAddress (property field)
 	GetSourceNetworkAddress() *uint16
-	// GetSourceLength returns SourceLength
+	// GetSourceLength returns SourceLength (property field)
 	GetSourceLength() *uint8
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() []uint8
-	// GetHopCount returns HopCount
+	// GetHopCount returns HopCount (property field)
 	GetHopCount() *uint8
-	// GetNlm returns Nlm
+	// GetNlm returns Nlm (property field)
 	GetNlm() *NLM
-	// GetApdu returns Apdu
+	// GetApdu returns Apdu (property field)
 	GetApdu() *APDU
-	// GetSourceLengthAddon returns SourceLengthAddon
+	// GetSourceLengthAddon returns SourceLengthAddon (virtual field)
 	GetSourceLengthAddon() uint16
-	// GetDestinationLengthAddon returns DestinationLengthAddon
+	// GetDestinationLengthAddon returns DestinationLengthAddon (virtual field)
 	GetDestinationLengthAddon() uint16
-	// GetPayloadSubtraction returns PayloadSubtraction
+	// GetPayloadSubtraction returns PayloadSubtraction (virtual field)
 	GetPayloadSubtraction() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go
index 3aa5bb8..0ec3fa8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDUControl.go
@@ -38,15 +38,15 @@ type NPDUControl struct {
 
 // The corresponding interface
 type INPDUControl interface {
-	// GetMessageTypeFieldPresent returns MessageTypeFieldPresent
+	// GetMessageTypeFieldPresent returns MessageTypeFieldPresent (property field)
 	GetMessageTypeFieldPresent() bool
-	// GetDestinationSpecified returns DestinationSpecified
+	// GetDestinationSpecified returns DestinationSpecified (property field)
 	GetDestinationSpecified() bool
-	// GetSourceSpecified returns SourceSpecified
+	// GetSourceSpecified returns SourceSpecified (property field)
 	GetSourceSpecified() bool
-	// GetExpectingReply returns ExpectingReply
+	// GetExpectingReply returns ExpectingReply (property field)
 	GetExpectingReply() bool
-	// GetNetworkPriority returns NetworkPriority
+	// GetNetworkPriority returns NetworkPriority (property field)
 	GetNetworkPriority() NPDUNetworkPriority
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/Alpha.go b/plc4go/internal/plc4go/cbus/readwrite/model/Alpha.go
index bd14b91..3cd68ae 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/Alpha.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/Alpha.go
@@ -33,7 +33,7 @@ type Alpha struct {
 
 // The corresponding interface
 type IAlpha interface {
-	// GetCharacter returns Character
+	// GetCharacter returns Character (property field)
 	GetCharacter() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/BridgeAddress.go b/plc4go/internal/plc4go/cbus/readwrite/model/BridgeAddress.go
index f12cc96..34d0925 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/BridgeAddress.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/BridgeAddress.go
@@ -33,7 +33,7 @@ type BridgeAddress struct {
 
 // The corresponding interface
 type IBridgeAddress interface {
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/BridgeCount.go b/plc4go/internal/plc4go/cbus/readwrite/model/BridgeCount.go
index e2b30c2..73e82a1 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/BridgeCount.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/BridgeCount.go
@@ -33,7 +33,7 @@ type BridgeCount struct {
 
 // The corresponding interface
 type IBridgeCount interface {
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALData.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALData.go
index 52556ac..0cde4ea 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALData.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALData.go
@@ -34,11 +34,9 @@ type CALData struct {
 
 // The corresponding interface
 type ICALData interface {
-	// CommandType returns CommandType
-	CommandType() CALCommandType
-	// GetCommandTypeContainer returns CommandTypeContainer
+	// GetCommandTypeContainer returns CommandTypeContainer (property field)
 	GetCommandTypeContainer() CALCommandTypeContainer
-	// GetCommandType returns CommandType
+	// GetCommandType returns CommandType (virtual field)
 	GetCommandType() CALCommandType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyAcknowledge.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyAcknowledge.go
index b9671b9..bc50457 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyAcknowledge.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyAcknowledge.go
@@ -36,9 +36,9 @@ type CALDataReplyAcknowledge struct {
 // The corresponding interface
 type ICALDataReplyAcknowledge interface {
 	ICALData
-	// GetParamNo returns ParamNo
+	// GetParamNo returns ParamNo (property field)
 	GetParamNo() uint8
-	// GetCode returns Code
+	// GetCode returns Code (property field)
 	GetCode() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICALDataReplyAcknowledge interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataReplyAcknowledge) CommandType() CALCommandType {
-	return CALCommandType_ACKNOWLEDGE
-}
-
-func (m *CALDataReplyAcknowledge) GetCommandType() CALCommandType {
-	return CALCommandType_ACKNOWLEDGE
-}
 
 func (m *CALDataReplyAcknowledge) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyReply.go
index 4ebb43b..e72bc5a 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyReply.go
@@ -36,9 +36,9 @@ type CALDataReplyReply struct {
 // The corresponding interface
 type ICALDataReplyReply interface {
 	ICALData
-	// GetParamNumber returns ParamNumber
+	// GetParamNumber returns ParamNumber (property field)
 	GetParamNumber() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICALDataReplyReply interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataReplyReply) CommandType() CALCommandType {
-	return CALCommandType_REPLY
-}
-
-func (m *CALDataReplyReply) GetCommandType() CALCommandType {
-	return CALCommandType_REPLY
-}
 
 func (m *CALDataReplyReply) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatus.go
index c414c7f..10da91a 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatus.go
@@ -37,11 +37,11 @@ type CALDataReplyStatus struct {
 // The corresponding interface
 type ICALDataReplyStatus interface {
 	ICALData
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetBlockStart returns BlockStart
+	// GetBlockStart returns BlockStart (property field)
 	GetBlockStart() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -54,13 +54,6 @@ type ICALDataReplyStatus interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataReplyStatus) CommandType() CALCommandType {
-	return CALCommandType_STATUS
-}
-
-func (m *CALDataReplyStatus) GetCommandType() CALCommandType {
-	return CALCommandType_STATUS
-}
 
 func (m *CALDataReplyStatus) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatusExtended.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatusExtended.go
index 6e100f6..072a825 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatusExtended.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataReplyStatusExtended.go
@@ -38,13 +38,13 @@ type CALDataReplyStatusExtended struct {
 // The corresponding interface
 type ICALDataReplyStatusExtended interface {
 	ICALData
-	// GetEncoding returns Encoding
+	// GetEncoding returns Encoding (property field)
 	GetEncoding() uint8
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetBlockStart returns BlockStart
+	// GetBlockStart returns BlockStart (property field)
 	GetBlockStart() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -57,13 +57,6 @@ type ICALDataReplyStatusExtended interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataReplyStatusExtended) CommandType() CALCommandType {
-	return CALCommandType_STATUS_EXTENDED
-}
-
-func (m *CALDataReplyStatusExtended) GetCommandType() CALCommandType {
-	return CALCommandType_STATUS_EXTENDED
-}
 
 func (m *CALDataReplyStatusExtended) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestGetStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestGetStatus.go
index 33f8010..379808c 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestGetStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestGetStatus.go
@@ -36,9 +36,9 @@ type CALDataRequestGetStatus struct {
 // The corresponding interface
 type ICALDataRequestGetStatus interface {
 	ICALData
-	// GetParamNo returns ParamNo
+	// GetParamNo returns ParamNo (property field)
 	GetParamNo() uint8
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICALDataRequestGetStatus interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataRequestGetStatus) CommandType() CALCommandType {
-	return CALCommandType_GET_STATUS
-}
-
-func (m *CALDataRequestGetStatus) GetCommandType() CALCommandType {
-	return CALCommandType_GET_STATUS
-}
 
 func (m *CALDataRequestGetStatus) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestIdentify.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestIdentify.go
index 42ee762..97c7024 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestIdentify.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestIdentify.go
@@ -35,7 +35,7 @@ type CALDataRequestIdentify struct {
 // The corresponding interface
 type ICALDataRequestIdentify interface {
 	ICALData
-	// GetAttribute returns Attribute
+	// GetAttribute returns Attribute (property field)
 	GetAttribute() Attribute
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type ICALDataRequestIdentify interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataRequestIdentify) CommandType() CALCommandType {
-	return CALCommandType_IDENTIFY
-}
-
-func (m *CALDataRequestIdentify) GetCommandType() CALCommandType {
-	return CALCommandType_IDENTIFY
-}
 
 func (m *CALDataRequestIdentify) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestRecall.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestRecall.go
index 5c2c2d0..9183f70 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestRecall.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestRecall.go
@@ -36,9 +36,9 @@ type CALDataRequestRecall struct {
 // The corresponding interface
 type ICALDataRequestRecall interface {
 	ICALData
-	// GetParamNo returns ParamNo
+	// GetParamNo returns ParamNo (property field)
 	GetParamNo() uint8
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICALDataRequestRecall interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataRequestRecall) CommandType() CALCommandType {
-	return CALCommandType_RECALL
-}
-
-func (m *CALDataRequestRecall) GetCommandType() CALCommandType {
-	return CALCommandType_RECALL
-}
 
 func (m *CALDataRequestRecall) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestReset.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestReset.go
index 3748791..8f824fd 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestReset.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALDataRequestReset.go
@@ -44,13 +44,6 @@ type ICALDataRequestReset interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CALDataRequestReset) CommandType() CALCommandType {
-	return CALCommandType_RESET
-}
-
-func (m *CALDataRequestReset) GetCommandType() CALCommandType {
-	return CALCommandType_RESET
-}
 
 func (m *CALDataRequestReset) InitializeParent(parent *CALData, commandTypeContainer CALCommandTypeContainer) {
 	m.CALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALReply.go
index b73f7c2..e52b528 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALReply.go
@@ -40,9 +40,9 @@ type CALReply struct {
 
 // The corresponding interface
 type ICALReply interface {
-	// GetCalType returns CalType
+	// GetCalType returns CalType (property field)
 	GetCalType() byte
-	// GetCalData returns CalData
+	// GetCalData returns CalData (property field)
 	GetCalData() *CALData
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyLong.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyLong.go
index 8e46e2e..4df91c9 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyLong.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyLong.go
@@ -42,19 +42,19 @@ type CALReplyLong struct {
 // The corresponding interface
 type ICALReplyLong interface {
 	ICALReply
-	// GetTerminatingByte returns TerminatingByte
+	// GetTerminatingByte returns TerminatingByte (property field)
 	GetTerminatingByte() uint32
-	// GetUnitAddress returns UnitAddress
+	// GetUnitAddress returns UnitAddress (property field)
 	GetUnitAddress() *UnitAddress
-	// GetBridgeAddress returns BridgeAddress
+	// GetBridgeAddress returns BridgeAddress (property field)
 	GetBridgeAddress() *BridgeAddress
-	// GetSerialInterfaceAddress returns SerialInterfaceAddress
+	// GetSerialInterfaceAddress returns SerialInterfaceAddress (property field)
 	GetSerialInterfaceAddress() *SerialInterfaceAddress
-	// GetReservedByte returns ReservedByte
+	// GetReservedByte returns ReservedByte (property field)
 	GetReservedByte() *byte
-	// GetReplyNetwork returns ReplyNetwork
+	// GetReplyNetwork returns ReplyNetwork (property field)
 	GetReplyNetwork() *ReplyNetwork
-	// GetIsUnitAddress returns IsUnitAddress
+	// GetIsUnitAddress returns IsUnitAddress (virtual field)
 	GetIsUnitAddress() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyReply.go
index 66a0968..5dd01ec 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CALReplyReply.go
@@ -35,7 +35,7 @@ type CALReplyReply struct {
 // The corresponding interface
 type ICALReplyReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *CALReply
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommand.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommand.go
index 00b206c..8dd9008 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommand.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommand.go
@@ -41,11 +41,9 @@ type CBusCommand struct {
 
 // The corresponding interface
 type ICBusCommand interface {
-	// DestinationAddressType returns DestinationAddressType
-	DestinationAddressType() DestinationAddressType
-	// GetHeader returns Header
+	// GetHeader returns Header (property field)
 	GetHeader() *CBusHeader
-	// GetDestinationAddressType returns DestinationAddressType
+	// GetDestinationAddressType returns DestinationAddressType (virtual field)
 	GetDestinationAddressType() DestinationAddressType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToMultiPoint.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
index 3640332..77f9c3e 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToMultiPoint.go
@@ -38,7 +38,7 @@ type CBusCommandPointToMultiPoint struct {
 // The corresponding interface
 type ICBusCommandPointToMultiPoint interface {
 	ICBusCommand
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *CBusPointToMultiPointCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICBusCommandPointToMultiPoint interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CBusCommandPointToMultiPoint) DestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToMultiPoint
-}
-
-func (m *CBusCommandPointToMultiPoint) GetDestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToMultiPoint
-}
 
 func (m *CBusCommandPointToMultiPoint) InitializeParent(parent *CBusCommand, header *CBusHeader) {
 	m.CBusCommand.Header = header
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPoint.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPoint.go
index dc2d330..47f4197 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPoint.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPoint.go
@@ -38,7 +38,7 @@ type CBusCommandPointToPoint struct {
 // The corresponding interface
 type ICBusCommandPointToPoint interface {
 	ICBusCommand
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *CBusPointToPointCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICBusCommandPointToPoint interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CBusCommandPointToPoint) DestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToPoint
-}
-
-func (m *CBusCommandPointToPoint) GetDestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToPoint
-}
 
 func (m *CBusCommandPointToPoint) InitializeParent(parent *CBusCommand, header *CBusHeader) {
 	m.CBusCommand.Header = header
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
index c790e74..dc4a7a7 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPoint.go
@@ -38,7 +38,7 @@ type CBusCommandPointToPointToMultiPoint struct {
 // The corresponding interface
 type ICBusCommandPointToPointToMultiPoint interface {
 	ICBusCommand
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *CBusPointToPointToMultipointCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ICBusCommandPointToPointToMultiPoint interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CBusCommandPointToPointToMultiPoint) DestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToPointToMultiPoint
-}
-
-func (m *CBusCommandPointToPointToMultiPoint) GetDestinationAddressType() DestinationAddressType {
-	return DestinationAddressType_PointToPointToMultiPoint
-}
 
 func (m *CBusCommandPointToPointToMultiPoint) InitializeParent(parent *CBusCommand, header *CBusHeader) {
 	m.CBusCommand.Header = header
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointNormal.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointNormal.go
index f3487a1..5d9d897 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointNormal.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointNormal.go
@@ -47,15 +47,15 @@ type CBusCommandPointToPointToMultiPointNormal struct {
 // The corresponding interface
 type ICBusCommandPointToPointToMultiPointNormal interface {
 	ICBusPointToPointToMultipointCommand
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetSalData returns SalData
+	// GetSalData returns SalData (property field)
 	GetSalData() *SALData
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
-	// GetPeekAlpha returns PeekAlpha
+	// GetPeekAlpha returns PeekAlpha (property field)
 	GetPeekAlpha() byte
-	// GetAlpha returns Alpha
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointStatus.go
index 6a5eaf9..a01b3f9 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusCommandPointToPointToMultiPointStatus.go
@@ -47,13 +47,13 @@ type CBusCommandPointToPointToMultiPointStatus struct {
 // The corresponding interface
 type ICBusCommandPointToPointToMultiPointStatus interface {
 	ICBusPointToPointToMultipointCommand
-	// GetStatusRequest returns StatusRequest
+	// GetStatusRequest returns StatusRequest (property field)
 	GetStatusRequest() *StatusRequest
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
-	// GetPeekAlpha returns PeekAlpha
+	// GetPeekAlpha returns PeekAlpha (property field)
 	GetPeekAlpha() byte
-	// GetAlpha returns Alpha
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusHeader.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusHeader.go
index 9c73941..d20832a 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusHeader.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusHeader.go
@@ -35,9 +35,9 @@ type CBusHeader struct {
 
 // The corresponding interface
 type ICBusHeader interface {
-	// GetPriorityClass returns PriorityClass
+	// GetPriorityClass returns PriorityClass (property field)
 	GetPriorityClass() PriorityClass
-	// GetDestinationAddressType returns DestinationAddressType
+	// GetDestinationAddressType returns DestinationAddressType (property field)
 	GetDestinationAddressType() DestinationAddressType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusOptions.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusOptions.go
index 41c93ca..6665619 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusOptions.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusOptions.go
@@ -40,21 +40,21 @@ type CBusOptions struct {
 
 // The corresponding interface
 type ICBusOptions interface {
-	// GetConnect returns Connect
+	// GetConnect returns Connect (property field)
 	GetConnect() bool
-	// GetSmart returns Smart
+	// GetSmart returns Smart (property field)
 	GetSmart() bool
-	// GetIdmon returns Idmon
+	// GetIdmon returns Idmon (property field)
 	GetIdmon() bool
-	// GetExstat returns Exstat
+	// GetExstat returns Exstat (property field)
 	GetExstat() bool
-	// GetMonitor returns Monitor
+	// GetMonitor returns Monitor (property field)
 	GetMonitor() bool
-	// GetMonall returns Monall
+	// GetMonall returns Monall (property field)
 	GetMonall() bool
-	// GetPun returns Pun
+	// GetPun returns Pun (property field)
 	GetPun() bool
-	// GetPcn returns Pcn
+	// GetPcn returns Pcn (property field)
 	GetPcn() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommand.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommand.go
index 1d936d8..e06675b 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommand.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommand.go
@@ -37,7 +37,7 @@ type CBusPointToMultiPointCommand struct {
 
 // The corresponding interface
 type ICBusPointToMultiPointCommand interface {
-	// GetPeekedApplication returns PeekedApplication
+	// GetPeekedApplication returns PeekedApplication (property field)
 	GetPeekedApplication() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
index 53a2d05..0a7eba8 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandNormal.go
@@ -48,15 +48,15 @@ type CBusPointToMultiPointCommandNormal struct {
 // The corresponding interface
 type ICBusPointToMultiPointCommandNormal interface {
 	ICBusPointToMultiPointCommand
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetSalData returns SalData
+	// GetSalData returns SalData (property field)
 	GetSalData() *SALData
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
-	// GetPeekAlpha returns PeekAlpha
+	// GetPeekAlpha returns PeekAlpha (property field)
 	GetPeekAlpha() byte
-	// GetAlpha returns Alpha
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
index 5d12363..d00a961 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToMultiPointCommandStatus.go
@@ -47,13 +47,13 @@ type CBusPointToMultiPointCommandStatus struct {
 // The corresponding interface
 type ICBusPointToMultiPointCommandStatus interface {
 	ICBusPointToMultiPointCommand
-	// GetStatusRequest returns StatusRequest
+	// GetStatusRequest returns StatusRequest (property field)
 	GetStatusRequest() *StatusRequest
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
-	// GetPeekAlpha returns PeekAlpha
+	// GetPeekAlpha returns PeekAlpha (property field)
 	GetPeekAlpha() byte
-	// GetAlpha returns Alpha
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommand.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommand.go
index 9d77163..564c388 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommand.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommand.go
@@ -46,19 +46,17 @@ type CBusPointToPointCommand struct {
 
 // The corresponding interface
 type ICBusPointToPointCommand interface {
-	// IsDirect returns IsDirect
-	IsDirect() bool
-	// GetBridgeAddressCountPeek returns BridgeAddressCountPeek
+	// GetBridgeAddressCountPeek returns BridgeAddressCountPeek (property field)
 	GetBridgeAddressCountPeek() uint16
-	// GetCalData returns CalData
+	// GetCalData returns CalData (property field)
 	GetCalData() *CALData
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
-	// GetPeekAlpha returns PeekAlpha
+	// GetPeekAlpha returns PeekAlpha (property field)
 	GetPeekAlpha() byte
-	// GetAlpha returns Alpha
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
-	// GetIsDirect returns IsDirect
+	// GetIsDirect returns IsDirect (virtual field)
 	GetIsDirect() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandDirect.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandDirect.go
index 032ed5f..4ac83b0 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandDirect.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandDirect.go
@@ -39,7 +39,7 @@ type CBusPointToPointCommandDirect struct {
 // The corresponding interface
 type ICBusPointToPointCommandDirect interface {
 	ICBusPointToPointCommand
-	// GetUnitAddress returns UnitAddress
+	// GetUnitAddress returns UnitAddress (property field)
 	GetUnitAddress() *UnitAddress
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -52,13 +52,6 @@ type ICBusPointToPointCommandDirect interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CBusPointToPointCommandDirect) IsDirect() bool {
-	return bool(true)
-}
-
-func (m *CBusPointToPointCommandDirect) GetIsDirect() bool {
-	return bool(true)
-}
 
 func (m *CBusPointToPointCommandDirect) InitializeParent(parent *CBusPointToPointCommand, bridgeAddressCountPeek uint16, calData *CALData, crc *Checksum, peekAlpha byte, alpha *Alpha) {
 	m.CBusPointToPointCommand.BridgeAddressCountPeek = bridgeAddressCountPeek
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandIndirect.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
index 92047f9..8044cda 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointCommandIndirect.go
@@ -40,11 +40,11 @@ type CBusPointToPointCommandIndirect struct {
 // The corresponding interface
 type ICBusPointToPointCommandIndirect interface {
 	ICBusPointToPointCommand
-	// GetBridgeAddress returns BridgeAddress
+	// GetBridgeAddress returns BridgeAddress (property field)
 	GetBridgeAddress() *BridgeAddress
-	// GetNetworkRoute returns NetworkRoute
+	// GetNetworkRoute returns NetworkRoute (property field)
 	GetNetworkRoute() *NetworkRoute
-	// GetUnitAddress returns UnitAddress
+	// GetUnitAddress returns UnitAddress (property field)
 	GetUnitAddress() *UnitAddress
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -57,13 +57,6 @@ type ICBusPointToPointCommandIndirect interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CBusPointToPointCommandIndirect) IsDirect() bool {
-	return bool(false)
-}
-
-func (m *CBusPointToPointCommandIndirect) GetIsDirect() bool {
-	return bool(false)
-}
 
 func (m *CBusPointToPointCommandIndirect) InitializeParent(parent *CBusPointToPointCommand, bridgeAddressCountPeek uint16, calData *CALData, crc *Checksum, peekAlpha byte, alpha *Alpha) {
 	m.CBusPointToPointCommand.BridgeAddressCountPeek = bridgeAddressCountPeek
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointToMultipointCommand.go b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointToMultipointCommand.go
index 468cc77..c9d67d4 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointToMultipointCommand.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CBusPointToPointToMultipointCommand.go
@@ -39,11 +39,11 @@ type CBusPointToPointToMultipointCommand struct {
 
 // The corresponding interface
 type ICBusPointToPointToMultipointCommand interface {
-	// GetBridgeAddress returns BridgeAddress
+	// GetBridgeAddress returns BridgeAddress (property field)
 	GetBridgeAddress() *BridgeAddress
-	// GetNetworkRoute returns NetworkRoute
+	// GetNetworkRoute returns NetworkRoute (property field)
 	GetNetworkRoute() *NetworkRoute
-	// GetPeekedApplication returns PeekedApplication
+	// GetPeekedApplication returns PeekedApplication (property field)
 	GetPeekedApplication() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/Checksum.go b/plc4go/internal/plc4go/cbus/readwrite/model/Checksum.go
index 8deb555..c5b61bc 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/Checksum.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/Checksum.go
@@ -33,7 +33,7 @@ type Checksum struct {
 
 // The corresponding interface
 type IChecksum interface {
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/CommandHeader.go b/plc4go/internal/plc4go/cbus/readwrite/model/CommandHeader.go
index 7ff55fd..5764a50 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/CommandHeader.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/CommandHeader.go
@@ -33,7 +33,7 @@ type CommandHeader struct {
 
 // The corresponding interface
 type ICommandHeader interface {
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/Confirmation.go b/plc4go/internal/plc4go/cbus/readwrite/model/Confirmation.go
index a81be72..2a532ab 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/Confirmation.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/Confirmation.go
@@ -34,9 +34,9 @@ type Confirmation struct {
 
 // The corresponding interface
 type IConfirmation interface {
-	// ConfirmationType returns ConfirmationType
-	ConfirmationType() byte
-	// GetAlpha returns Alpha
+	// GetConfirmationType returns ConfirmationType (discriminator field)
+	GetConfirmationType() byte
+	// GetAlpha returns Alpha (property field)
 	GetAlpha() *Alpha
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -190,7 +190,7 @@ func (m *Confirmation) SerializeParent(writeBuffer utils.WriteBuffer, child ICon
 	}
 
 	// Discriminator Field (confirmationType) (Used as input to a switch field)
-	confirmationType := byte(child.ConfirmationType())
+	confirmationType := byte(child.GetConfirmationType())
 	_confirmationTypeErr := writeBuffer.WriteByte("confirmationType", (confirmationType))
 
 	if _confirmationTypeErr != nil {
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationReply.go
index 390e6f9..98d929d 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationReply.go
@@ -35,7 +35,7 @@ type ConfirmationReply struct {
 // The corresponding interface
 type IConfirmationReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *Confirmation
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ExclamationMarkReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/ExclamationMarkReply.go
index ba2bfc8..dd0a2fd 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ExclamationMarkReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ExclamationMarkReply.go
@@ -35,7 +35,7 @@ type ExclamationMarkReply struct {
 // The corresponding interface
 type IExclamationMarkReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *ExclamationMark
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedFormatStatusReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedFormatStatusReply.go
index eb43c58..ab682ec 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedFormatStatusReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedFormatStatusReply.go
@@ -43,17 +43,17 @@ type ExtendedFormatStatusReply struct {
 
 // The corresponding interface
 type IExtendedFormatStatusReply interface {
-	// GetStatusHeader returns StatusHeader
+	// GetStatusHeader returns StatusHeader (property field)
 	GetStatusHeader() *ExtendedStatusHeader
-	// GetCoding returns Coding
+	// GetCoding returns Coding (property field)
 	GetCoding() StatusCoding
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetBlockStart returns BlockStart
+	// GetBlockStart returns BlockStart (property field)
 	GetBlockStart() uint8
-	// GetStatusBytes returns StatusBytes
+	// GetStatusBytes returns StatusBytes (property field)
 	GetStatusBytes() []*StatusByte
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedStatusHeader.go b/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedStatusHeader.go
index d54e90e..54c7f8b 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedStatusHeader.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ExtendedStatusHeader.go
@@ -34,7 +34,7 @@ type ExtendedStatusHeader struct {
 
 // The corresponding interface
 type IExtendedStatusHeader interface {
-	// GetNumberOfCharacterPairs returns NumberOfCharacterPairs
+	// GetNumberOfCharacterPairs returns NumberOfCharacterPairs (property field)
 	GetNumberOfCharacterPairs() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommand.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommand.go
index db83abb..f176c67 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommand.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommand.go
@@ -33,8 +33,8 @@ type IdentifyReplyCommand struct {
 
 // The corresponding interface
 type IIdentifyReplyCommand interface {
-	// Attribute returns Attribute
-	Attribute() Attribute
+	// GetAttribute returns Attribute (discriminator field)
+	GetAttribute() Attribute
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
index 654fd99..3943d18 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
@@ -44,25 +44,25 @@ type IdentifyReplyCommandDSIStatus struct {
 // The corresponding interface
 type IIdentifyReplyCommandDSIStatus interface {
 	IIdentifyReplyCommand
-	// GetChannelStatus1 returns ChannelStatus1
+	// GetChannelStatus1 returns ChannelStatus1 (property field)
 	GetChannelStatus1() ChannelStatus
-	// GetChannelStatus2 returns ChannelStatus2
+	// GetChannelStatus2 returns ChannelStatus2 (property field)
 	GetChannelStatus2() ChannelStatus
-	// GetChannelStatus3 returns ChannelStatus3
+	// GetChannelStatus3 returns ChannelStatus3 (property field)
 	GetChannelStatus3() ChannelStatus
-	// GetChannelStatus4 returns ChannelStatus4
+	// GetChannelStatus4 returns ChannelStatus4 (property field)
 	GetChannelStatus4() ChannelStatus
-	// GetChannelStatus5 returns ChannelStatus5
+	// GetChannelStatus5 returns ChannelStatus5 (property field)
 	GetChannelStatus5() ChannelStatus
-	// GetChannelStatus6 returns ChannelStatus6
+	// GetChannelStatus6 returns ChannelStatus6 (property field)
 	GetChannelStatus6() ChannelStatus
-	// GetChannelStatus7 returns ChannelStatus7
+	// GetChannelStatus7 returns ChannelStatus7 (property field)
 	GetChannelStatus7() ChannelStatus
-	// GetChannelStatus8 returns ChannelStatus8
+	// GetChannelStatus8 returns ChannelStatus8 (property field)
 	GetChannelStatus8() ChannelStatus
-	// GetUnitStatus returns UnitStatus
+	// GetUnitStatus returns UnitStatus (property field)
 	GetUnitStatus() UnitStatus
-	// GetDimmingUCRevisionNumber returns DimmingUCRevisionNumber
+	// GetDimmingUCRevisionNumber returns DimmingUCRevisionNumber (property field)
 	GetDimmingUCRevisionNumber() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
index c0ccc09..d73d712 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
@@ -54,43 +54,43 @@ type IdentifyReplyCommandExtendedDiagnosticSummary struct {
 // The corresponding interface
 type IIdentifyReplyCommandExtendedDiagnosticSummary interface {
 	IIdentifyReplyCommand
-	// GetLowApplication returns LowApplication
+	// GetLowApplication returns LowApplication (property field)
 	GetLowApplication() ApplicationIdContainer
-	// GetHighApplication returns HighApplication
+	// GetHighApplication returns HighApplication (property field)
 	GetHighApplication() ApplicationIdContainer
-	// GetArea returns Area
+	// GetArea returns Area (property field)
 	GetArea() byte
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() uint16
-	// GetSerialNumber returns SerialNumber
+	// GetSerialNumber returns SerialNumber (property field)
 	GetSerialNumber() uint32
-	// GetNetworkVoltage returns NetworkVoltage
+	// GetNetworkVoltage returns NetworkVoltage (property field)
 	GetNetworkVoltage() byte
-	// GetOutputUnit returns OutputUnit
+	// GetOutputUnit returns OutputUnit (property field)
 	GetOutputUnit() bool
-	// GetEnableChecksumAlarm returns EnableChecksumAlarm
+	// GetEnableChecksumAlarm returns EnableChecksumAlarm (property field)
 	GetEnableChecksumAlarm() bool
-	// GetNetworkVoltageMarginal returns NetworkVoltageMarginal
+	// GetNetworkVoltageMarginal returns NetworkVoltageMarginal (property field)
 	GetNetworkVoltageMarginal() bool
-	// GetNetworkVoltageLow returns NetworkVoltageLow
+	// GetNetworkVoltageLow returns NetworkVoltageLow (property field)
 	GetNetworkVoltageLow() bool
-	// GetUnitInLearnMode returns UnitInLearnMode
+	// GetUnitInLearnMode returns UnitInLearnMode (property field)
 	GetUnitInLearnMode() bool
-	// GetMicroPowerReset returns MicroPowerReset
+	// GetMicroPowerReset returns MicroPowerReset (property field)
 	GetMicroPowerReset() bool
-	// GetInternalStackOverflow returns InternalStackOverflow
+	// GetInternalStackOverflow returns InternalStackOverflow (property field)
 	GetInternalStackOverflow() bool
-	// GetCommsTxError returns CommsTxError
+	// GetCommsTxError returns CommsTxError (property field)
 	GetCommsTxError() bool
-	// GetMicroReset returns MicroReset
+	// GetMicroReset returns MicroReset (property field)
 	GetMicroReset() bool
-	// GetEEDataError returns EEDataError
+	// GetEEDataError returns EEDataError (property field)
 	GetEEDataError() bool
-	// GetEEChecksumError returns EEChecksumError
+	// GetEEChecksumError returns EEChecksumError (property field)
 	GetEEChecksumError() bool
-	// GetEEWriteError returns EEWriteError
+	// GetEEWriteError returns EEWriteError (property field)
 	GetEEWriteError() bool
-	// GetInstallationMMIError returns InstallationMMIError
+	// GetInstallationMMIError returns InstallationMMIError (property field)
 	GetInstallationMMIError() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
index ce99580..0d1ad09 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
@@ -37,11 +37,11 @@ type IdentifyReplyCommandFirmwareSummary struct {
 // The corresponding interface
 type IIdentifyReplyCommandFirmwareSummary interface {
 	IIdentifyReplyCommand
-	// GetFirmwareVersion returns FirmwareVersion
+	// GetFirmwareVersion returns FirmwareVersion (property field)
 	GetFirmwareVersion() string
-	// GetUnitServiceType returns UnitServiceType
+	// GetUnitServiceType returns UnitServiceType (property field)
 	GetUnitServiceType() byte
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
index c03419a..4e50b73 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandFirmwareVersion struct {
 // The corresponding interface
 type IIdentifyReplyCommandFirmwareVersion interface {
 	IIdentifyReplyCommand
-	// GetFirmwareVersion returns FirmwareVersion
+	// GetFirmwareVersion returns FirmwareVersion (property field)
 	GetFirmwareVersion() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
index 817763d..6468ac4 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandGAVPhysicalAddresses struct {
 // The corresponding interface
 type IIdentifyReplyCommandGAVPhysicalAddresses interface {
 	IIdentifyReplyCommand
-	// GetValues returns Values
+	// GetValues returns Values (property field)
 	GetValues() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
index 6986359..f262110 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandGAVValuesCurrent struct {
 // The corresponding interface
 type IIdentifyReplyCommandGAVValuesCurrent interface {
 	IIdentifyReplyCommand
-	// GetValues returns Values
+	// GetValues returns Values (property field)
 	GetValues() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
index ddffc5b..14c6560 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandGAVValuesStored struct {
 // The corresponding interface
 type IIdentifyReplyCommandGAVValuesStored interface {
 	IIdentifyReplyCommand
-	// GetValues returns Values
+	// GetValues returns Values (property field)
 	GetValues() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
index 9f6e481..ae92971 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandManufacturer struct {
 // The corresponding interface
 type IIdentifyReplyCommandManufacturer interface {
 	IIdentifyReplyCommand
-	// GetManufacturerName returns ManufacturerName
+	// GetManufacturerName returns ManufacturerName (property field)
 	GetManufacturerName() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
index 0b18440..8e87fff 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
@@ -41,9 +41,9 @@ type IdentifyReplyCommandNetworkVoltage struct {
 // The corresponding interface
 type IIdentifyReplyCommandNetworkVoltage interface {
 	IIdentifyReplyCommand
-	// GetVolts returns Volts
+	// GetVolts returns Volts (property field)
 	GetVolts() string
-	// GetVoltsDecimalPlace returns VoltsDecimalPlace
+	// GetVoltsDecimalPlace returns VoltsDecimalPlace (property field)
 	GetVoltsDecimalPlace() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
index a9faf04..0e3217f 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
@@ -35,7 +35,7 @@ type IdentifyReplyCommandType struct {
 // The corresponding interface
 type IIdentifyReplyCommandType interface {
 	IIdentifyReplyCommand
-	// GetUnitType returns UnitType
+	// GetUnitType returns UnitType (property field)
 	GetUnitType() string
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSAL.go b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSAL.go
index 51d758d..13c31db 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSAL.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSAL.go
@@ -41,9 +41,9 @@ type MonitoredSAL struct {
 
 // The corresponding interface
 type IMonitoredSAL interface {
-	// GetSalType returns SalType
+	// GetSalType returns SalType (property field)
 	GetSalType() byte
-	// GetSalData returns SalData
+	// GetSalData returns SalData (property field)
 	GetSalData() *SALData
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
index 9d3e0d4..85f10b1 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
@@ -42,19 +42,19 @@ type MonitoredSALLongFormSmartMode struct {
 // The corresponding interface
 type IMonitoredSALLongFormSmartMode interface {
 	IMonitoredSAL
-	// GetTerminatingByte returns TerminatingByte
+	// GetTerminatingByte returns TerminatingByte (property field)
 	GetTerminatingByte() uint32
-	// GetUnitAddress returns UnitAddress
+	// GetUnitAddress returns UnitAddress (property field)
 	GetUnitAddress() *UnitAddress
-	// GetBridgeAddress returns BridgeAddress
+	// GetBridgeAddress returns BridgeAddress (property field)
 	GetBridgeAddress() *BridgeAddress
-	// GetSerialInterfaceAddress returns SerialInterfaceAddress
+	// GetSerialInterfaceAddress returns SerialInterfaceAddress (property field)
 	GetSerialInterfaceAddress() *SerialInterfaceAddress
-	// GetReservedByte returns ReservedByte
+	// GetReservedByte returns ReservedByte (property field)
 	GetReservedByte() *byte
-	// GetReplyNetwork returns ReplyNetwork
+	// GetReplyNetwork returns ReplyNetwork (property field)
 	GetReplyNetwork() *ReplyNetwork
-	// GetIsUnitAddress returns IsUnitAddress
+	// GetIsUnitAddress returns IsUnitAddress (virtual field)
 	GetIsUnitAddress() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALReply.go
index 9c15f5f..d73a83c 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALReply.go
@@ -35,7 +35,7 @@ type MonitoredSALReply struct {
 // The corresponding interface
 type IMonitoredSALReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *MonitoredSAL
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
index bf8d84d..dffcd33 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
@@ -40,15 +40,15 @@ type MonitoredSALShortFormBasicMode struct {
 // The corresponding interface
 type IMonitoredSALShortFormBasicMode interface {
 	IMonitoredSAL
-	// GetCounts returns Counts
+	// GetCounts returns Counts (property field)
 	GetCounts() byte
-	// GetBridgeCount returns BridgeCount
+	// GetBridgeCount returns BridgeCount (property field)
 	GetBridgeCount() *BridgeCount
-	// GetNetworkNumber returns NetworkNumber
+	// GetNetworkNumber returns NetworkNumber (property field)
 	GetNetworkNumber() *NetworkNumber
-	// GetNoCounts returns NoCounts
+	// GetNoCounts returns NoCounts (property field)
 	GetNoCounts() *byte
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkNumber.go b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkNumber.go
index 1b81c81..8b339a3 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkNumber.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkNumber.go
@@ -33,7 +33,7 @@ type NetworkNumber struct {
 
 // The corresponding interface
 type INetworkNumber interface {
-	// GetNumber returns Number
+	// GetNumber returns Number (property field)
 	GetNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkProtocolControlInformation.go b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkProtocolControlInformation.go
index 817857c..2312184 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkProtocolControlInformation.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkProtocolControlInformation.go
@@ -35,9 +35,9 @@ type NetworkProtocolControlInformation struct {
 
 // The corresponding interface
 type INetworkProtocolControlInformation interface {
-	// GetStackCounter returns StackCounter
+	// GetStackCounter returns StackCounter (property field)
 	GetStackCounter() uint8
-	// GetStackDepth returns StackDepth
+	// GetStackDepth returns StackDepth (property field)
 	GetStackDepth() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkRoute.go b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkRoute.go
index 1465758..9d836ee 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NetworkRoute.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NetworkRoute.go
@@ -34,9 +34,9 @@ type NetworkRoute struct {
 
 // The corresponding interface
 type INetworkRoute interface {
-	// GetRouteType returns RouteType
+	// GetRouteType returns RouteType (property field)
 	GetRouteType() RouteType
-	// GetAdditionalBridgeAddresses returns AdditionalBridgeAddresses
+	// GetAdditionalBridgeAddresses returns AdditionalBridgeAddresses (property field)
 	GetAdditionalBridgeAddresses() []*BridgeAddress
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ParameterChangeReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/ParameterChangeReply.go
index af0eda9..465d0b6 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ParameterChangeReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ParameterChangeReply.go
@@ -35,7 +35,7 @@ type ParameterChangeReply struct {
 // The corresponding interface
 type IParameterChangeReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *ParameterChange
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/PowerUpReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/PowerUpReply.go
index 322de46..615cbaa 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/PowerUpReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/PowerUpReply.go
@@ -35,7 +35,7 @@ type PowerUpReply struct {
 // The corresponding interface
 type IPowerUpReply interface {
 	IReply
-	// GetIsA returns IsA
+	// GetIsA returns IsA (property field)
 	GetIsA() *PowerUp
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/Reply.go b/plc4go/internal/plc4go/cbus/readwrite/model/Reply.go
index 4e7a439..1901353 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/Reply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/Reply.go
@@ -34,7 +34,7 @@ type Reply struct {
 
 // The corresponding interface
 type IReply interface {
-	// GetMagicByte returns MagicByte
+	// GetMagicByte returns MagicByte (property field)
 	GetMagicByte() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ReplyNetwork.go b/plc4go/internal/plc4go/cbus/readwrite/model/ReplyNetwork.go
index e6e42a0..baabaab 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ReplyNetwork.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ReplyNetwork.go
@@ -35,11 +35,11 @@ type ReplyNetwork struct {
 
 // The corresponding interface
 type IReplyNetwork interface {
-	// GetRouteType returns RouteType
+	// GetRouteType returns RouteType (property field)
 	GetRouteType() RouteType
-	// GetAdditionalBridgeAddresses returns AdditionalBridgeAddresses
+	// GetAdditionalBridgeAddresses returns AdditionalBridgeAddresses (property field)
 	GetAdditionalBridgeAddresses() []*BridgeAddress
-	// GetUnitAddress returns UnitAddress
+	// GetUnitAddress returns UnitAddress (property field)
 	GetUnitAddress() *UnitAddress
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SALData.go b/plc4go/internal/plc4go/cbus/readwrite/model/SALData.go
index 74f680b..0d7089b4 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SALData.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SALData.go
@@ -34,11 +34,9 @@ type SALData struct {
 
 // The corresponding interface
 type ISALData interface {
-	// CommandType returns CommandType
-	CommandType() SALCommandType
-	// GetCommandTypeContainer returns CommandTypeContainer
+	// GetCommandTypeContainer returns CommandTypeContainer (property field)
 	GetCommandTypeContainer() SALCommandTypeContainer
-	// GetCommandType returns CommandType
+	// GetCommandType returns CommandType (virtual field)
 	GetCommandType() SALCommandType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOff.go b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOff.go
index d0bf56d..f124caf 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOff.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOff.go
@@ -35,7 +35,7 @@ type SALDataOff struct {
 // The corresponding interface
 type ISALDataOff interface {
 	ISALData
-	// GetGroup returns Group
+	// GetGroup returns Group (property field)
 	GetGroup() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type ISALDataOff interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SALDataOff) CommandType() SALCommandType {
-	return SALCommandType_OFF
-}
-
-func (m *SALDataOff) GetCommandType() SALCommandType {
-	return SALCommandType_OFF
-}
 
 func (m *SALDataOff) InitializeParent(parent *SALData, commandTypeContainer SALCommandTypeContainer) {
 	m.SALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOn.go b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOn.go
index e0b1a3a..02ef2eb 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOn.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataOn.go
@@ -35,7 +35,7 @@ type SALDataOn struct {
 // The corresponding interface
 type ISALDataOn interface {
 	ISALData
-	// GetGroup returns Group
+	// GetGroup returns Group (property field)
 	GetGroup() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type ISALDataOn interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SALDataOn) CommandType() SALCommandType {
-	return SALCommandType_ON
-}
-
-func (m *SALDataOn) GetCommandType() SALCommandType {
-	return SALCommandType_ON
-}
 
 func (m *SALDataOn) InitializeParent(parent *SALData, commandTypeContainer SALCommandTypeContainer) {
 	m.SALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataRampToLevel.go b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataRampToLevel.go
index 4cdb4c2..b9cc805 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataRampToLevel.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataRampToLevel.go
@@ -36,9 +36,9 @@ type SALDataRampToLevel struct {
 // The corresponding interface
 type ISALDataRampToLevel interface {
 	ISALData
-	// GetGroup returns Group
+	// GetGroup returns Group (property field)
 	GetGroup() byte
-	// GetLevel returns Level
+	// GetLevel returns Level (property field)
 	GetLevel() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -51,13 +51,6 @@ type ISALDataRampToLevel interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SALDataRampToLevel) CommandType() SALCommandType {
-	return SALCommandType_RAMP_TO_LEVEL
-}
-
-func (m *SALDataRampToLevel) GetCommandType() SALCommandType {
-	return SALCommandType_RAMP_TO_LEVEL
-}
 
 func (m *SALDataRampToLevel) InitializeParent(parent *SALData, commandTypeContainer SALCommandTypeContainer) {
 	m.SALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataTerminateRamp.go b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataTerminateRamp.go
index 18d00ca..ed10710 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SALDataTerminateRamp.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SALDataTerminateRamp.go
@@ -35,7 +35,7 @@ type SALDataTerminateRamp struct {
 // The corresponding interface
 type ISALDataTerminateRamp interface {
 	ISALData
-	// GetGroup returns Group
+	// GetGroup returns Group (property field)
 	GetGroup() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -48,13 +48,6 @@ type ISALDataTerminateRamp interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SALDataTerminateRamp) CommandType() SALCommandType {
-	return SALCommandType_TERMINATE_RAMP
-}
-
-func (m *SALDataTerminateRamp) GetCommandType() SALCommandType {
-	return SALCommandType_TERMINATE_RAMP
-}
 
 func (m *SALDataTerminateRamp) InitializeParent(parent *SALData, commandTypeContainer SALCommandTypeContainer) {
 	m.SALData.CommandTypeContainer = commandTypeContainer
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/SerialInterfaceAddress.go b/plc4go/internal/plc4go/cbus/readwrite/model/SerialInterfaceAddress.go
index 2134c35..e6a0ba4 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/SerialInterfaceAddress.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/SerialInterfaceAddress.go
@@ -33,7 +33,7 @@ type SerialInterfaceAddress struct {
 
 // The corresponding interface
 type ISerialInterfaceAddress interface {
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StandardFormatStatusReply.go b/plc4go/internal/plc4go/cbus/readwrite/model/StandardFormatStatusReply.go
index 53c33fb..08d05ae 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StandardFormatStatusReply.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StandardFormatStatusReply.go
@@ -42,15 +42,15 @@ type StandardFormatStatusReply struct {
 
 // The corresponding interface
 type IStandardFormatStatusReply interface {
-	// GetStatusHeader returns StatusHeader
+	// GetStatusHeader returns StatusHeader (property field)
 	GetStatusHeader() *StatusHeader
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() ApplicationIdContainer
-	// GetBlockStart returns BlockStart
+	// GetBlockStart returns BlockStart (property field)
 	GetBlockStart() uint8
-	// GetStatusBytes returns StatusBytes
+	// GetStatusBytes returns StatusBytes (property field)
 	GetStatusBytes() []*StatusByte
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *Checksum
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StatusByte.go b/plc4go/internal/plc4go/cbus/readwrite/model/StatusByte.go
index c4ee3d4..9995d74 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StatusByte.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StatusByte.go
@@ -36,13 +36,13 @@ type StatusByte struct {
 
 // The corresponding interface
 type IStatusByte interface {
-	// GetGav3 returns Gav3
+	// GetGav3 returns Gav3 (property field)
 	GetGav3() GAVState
-	// GetGav2 returns Gav2
+	// GetGav2 returns Gav2 (property field)
 	GetGav2() GAVState
-	// GetGav1 returns Gav1
+	// GetGav1 returns Gav1 (property field)
 	GetGav1() GAVState
-	// GetGav0 returns Gav0
+	// GetGav0 returns Gav0 (property field)
 	GetGav0() GAVState
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StatusHeader.go b/plc4go/internal/plc4go/cbus/readwrite/model/StatusHeader.go
index 393d87d..2753d8b 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StatusHeader.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StatusHeader.go
@@ -34,7 +34,7 @@ type StatusHeader struct {
 
 // The corresponding interface
 type IStatusHeader interface {
-	// GetNumberOfCharacterPairs returns NumberOfCharacterPairs
+	// GetNumberOfCharacterPairs returns NumberOfCharacterPairs (property field)
 	GetNumberOfCharacterPairs() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequest.go b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequest.go
index 73b4942..f2ab6de 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequest.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequest.go
@@ -34,7 +34,7 @@ type StatusRequest struct {
 
 // The corresponding interface
 type IStatusRequest interface {
-	// GetStatusType returns StatusType
+	// GetStatusType returns StatusType (property field)
 	GetStatusType() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestBinaryState.go b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestBinaryState.go
index 4c097d0..8a72c49 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestBinaryState.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestBinaryState.go
@@ -36,7 +36,7 @@ type StatusRequestBinaryState struct {
 // The corresponding interface
 type IStatusRequestBinaryState interface {
 	IStatusRequest
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestLevel.go b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestLevel.go
index dffc0d7..43ba921 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestLevel.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/StatusRequestLevel.go
@@ -37,9 +37,9 @@ type StatusRequestLevel struct {
 // The corresponding interface
 type IStatusRequestLevel interface {
 	IStatusRequest
-	// GetApplication returns Application
+	// GetApplication returns Application (property field)
 	GetApplication() byte
-	// GetStartingGroupAddressLabel returns StartingGroupAddressLabel
+	// GetStartingGroupAddressLabel returns StartingGroupAddressLabel (property field)
 	GetStartingGroupAddressLabel() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/UnitAddress.go b/plc4go/internal/plc4go/cbus/readwrite/model/UnitAddress.go
index e83ac10..7ef2645 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/UnitAddress.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/UnitAddress.go
@@ -33,7 +33,7 @@ type UnitAddress struct {
 
 // The corresponding interface
 type IUnitAddress interface {
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go
index 6f17563..b7ea8fc 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1Command.go
@@ -35,11 +35,11 @@ type DF1Command struct {
 
 // The corresponding interface
 type IDF1Command interface {
-	// CommandCode returns CommandCode
-	CommandCode() uint8
-	// GetStatus returns Status
+	// GetCommandCode returns CommandCode (discriminator field)
+	GetCommandCode() uint8
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetTransactionCounter returns TransactionCounter
+	// GetTransactionCounter returns TransactionCounter (property field)
 	GetTransactionCounter() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -183,7 +183,7 @@ func (m *DF1Command) SerializeParent(writeBuffer utils.WriteBuffer, child IDF1Co
 	}
 
 	// Discriminator Field (commandCode) (Used as input to a switch field)
-	commandCode := uint8(child.CommandCode())
+	commandCode := uint8(child.GetCommandCode())
 	_commandCodeErr := writeBuffer.WriteUint8("commandCode", 8, (commandCode))
 
 	if _commandCodeErr != nil {
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go
index 71fbee2..95a57a6 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1Symbol.go
@@ -37,8 +37,8 @@ type DF1Symbol struct {
 
 // The corresponding interface
 type IDF1Symbol interface {
-	// SymbolType returns SymbolType
-	SymbolType() uint8
+	// GetSymbolType returns SymbolType (discriminator field)
+	GetSymbolType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -174,7 +174,7 @@ func (m *DF1Symbol) SerializeParent(writeBuffer utils.WriteBuffer, child IDF1Sym
 	}
 
 	// Discriminator Field (symbolType) (Used as input to a switch field)
-	symbolType := uint8(child.SymbolType())
+	symbolType := uint8(child.GetSymbolType())
 	_symbolTypeErr := writeBuffer.WriteUint8("symbolType", 8, (symbolType))
 
 	if _symbolTypeErr != nil {
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
index f41b3c6..e7fa40d 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
@@ -42,11 +42,11 @@ type DF1SymbolMessageFrame struct {
 // The corresponding interface
 type IDF1SymbolMessageFrame interface {
 	IDF1Symbol
-	// GetDestinationAddress returns DestinationAddress
+	// GetDestinationAddress returns DestinationAddress (property field)
 	GetDestinationAddress() uint8
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() uint8
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *DF1Command
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
index 3f81ad5..2e5488f 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
@@ -36,9 +36,9 @@ type DF1UnprotectedReadRequest struct {
 // The corresponding interface
 type IDF1UnprotectedReadRequest interface {
 	IDF1Command
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetSize returns Size
+	// GetSize returns Size (property field)
 	GetSize() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
index 225192a..a19df65 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
@@ -34,7 +34,7 @@ type DF1UnprotectedReadResponse struct {
 // The corresponding interface
 type IDF1UnprotectedReadResponse interface {
 	IDF1Command
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
index 90e6c87..5e3b09f 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
@@ -42,7 +42,7 @@ type CipExchange struct {
 
 // The corresponding interface
 type ICipExchange interface {
-	// GetService returns Service
+	// GetService returns Service (property field)
 	GetService() *CipService
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
index c8977fd..4783a63 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
@@ -39,7 +39,7 @@ type CipRRData struct {
 // The corresponding interface
 type ICipRRData interface {
 	IEipPacket
-	// GetExchange returns Exchange
+	// GetExchange returns Exchange (property field)
 	GetExchange() *CipExchange
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
index 1ab64e6..044f485 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
@@ -40,11 +40,11 @@ type CipReadRequest struct {
 // The corresponding interface
 type ICipReadRequest interface {
 	ICipService
-	// GetRequestPathSize returns RequestPathSize
+	// GetRequestPathSize returns RequestPathSize (property field)
 	GetRequestPathSize() int8
-	// GetTag returns Tag
+	// GetTag returns Tag (property field)
 	GetTag() []byte
-	// GetElementNb returns ElementNb
+	// GetElementNb returns ElementNb (property field)
 	GetElementNb() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
index f63a59e..37d0079 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
@@ -42,13 +42,13 @@ type CipReadResponse struct {
 // The corresponding interface
 type ICipReadResponse interface {
 	ICipService
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetExtStatus returns ExtStatus
+	// GetExtStatus returns ExtStatus (property field)
 	GetExtStatus() uint8
-	// GetDataType returns DataType
+	// GetDataType returns DataType (property field)
 	GetDataType() CIPDataTypeCode
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
index 742a43f..581199a 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
@@ -36,8 +36,8 @@ type CipService struct {
 
 // The corresponding interface
 type ICipService interface {
-	// Service returns Service
-	Service() uint8
+	// GetService returns Service (discriminator field)
+	GetService() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -163,7 +163,7 @@ func (m *CipService) SerializeParent(writeBuffer utils.WriteBuffer, child ICipSe
 	}
 
 	// Discriminator Field (service) (Used as input to a switch field)
-	service := uint8(child.Service())
+	service := uint8(child.GetService())
 	_serviceErr := writeBuffer.WriteUint8("service", 8, (service))
 
 	if _serviceErr != nil {
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
index 4d8377e..ac4b46e 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
@@ -45,11 +45,11 @@ type CipUnconnectedRequest struct {
 // The corresponding interface
 type ICipUnconnectedRequest interface {
 	ICipService
-	// GetUnconnectedService returns UnconnectedService
+	// GetUnconnectedService returns UnconnectedService (property field)
 	GetUnconnectedService() *CipService
-	// GetBackPlane returns BackPlane
+	// GetBackPlane returns BackPlane (property field)
 	GetBackPlane() int8
-	// GetSlot returns Slot
+	// GetSlot returns Slot (property field)
 	GetSlot() int8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
index f9d9f91..3bee4f6 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
@@ -42,15 +42,15 @@ type CipWriteRequest struct {
 // The corresponding interface
 type ICipWriteRequest interface {
 	ICipService
-	// GetRequestPathSize returns RequestPathSize
+	// GetRequestPathSize returns RequestPathSize (property field)
 	GetRequestPathSize() int8
-	// GetTag returns Tag
+	// GetTag returns Tag (property field)
 	GetTag() []byte
-	// GetDataType returns DataType
+	// GetDataType returns DataType (property field)
 	GetDataType() CIPDataTypeCode
-	// GetElementNb returns ElementNb
+	// GetElementNb returns ElementNb (property field)
 	GetElementNb() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
index d5c0ed6..51b989d 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
@@ -40,9 +40,9 @@ type CipWriteResponse struct {
 // The corresponding interface
 type ICipWriteResponse interface {
 	ICipService
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetExtStatus returns ExtStatus
+	// GetExtStatus returns ExtStatus (property field)
 	GetExtStatus() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go b/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go
index f6d58f5..88d6680 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/EipPacket.go
@@ -37,15 +37,15 @@ type EipPacket struct {
 
 // The corresponding interface
 type IEipPacket interface {
-	// Command returns Command
-	Command() uint16
-	// GetSessionHandle returns SessionHandle
+	// GetCommand returns Command (discriminator field)
+	GetCommand() uint16
+	// GetSessionHandle returns SessionHandle (property field)
 	GetSessionHandle() uint32
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint32
-	// GetSenderContext returns SenderContext
+	// GetSenderContext returns SenderContext (property field)
 	GetSenderContext() []uint8
-	// GetOptions returns Options
+	// GetOptions returns Options (property field)
 	GetOptions() uint32
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -243,7 +243,7 @@ func (m *EipPacket) SerializeParent(writeBuffer utils.WriteBuffer, child IEipPac
 	}
 
 	// Discriminator Field (command) (Used as input to a switch field)
-	command := uint16(child.Command())
+	command := uint16(child.GetCommand())
 	_commandErr := writeBuffer.WriteUint16("command", 16, (command))
 
 	if _commandErr != nil {
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
index 19d8e9b..fb94db4 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
@@ -43,7 +43,7 @@ type MultipleServiceRequest struct {
 // The corresponding interface
 type IMultipleServiceRequest interface {
 	ICipService
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() *Services
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
index 7a5d2ae..f1d1f7e 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
@@ -43,15 +43,15 @@ type MultipleServiceResponse struct {
 // The corresponding interface
 type IMultipleServiceResponse interface {
 	ICipService
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint8
-	// GetExtStatus returns ExtStatus
+	// GetExtStatus returns ExtStatus (property field)
 	GetExtStatus() uint8
-	// GetServiceNb returns ServiceNb
+	// GetServiceNb returns ServiceNb (property field)
 	GetServiceNb() uint16
-	// GetOffsets returns Offsets
+	// GetOffsets returns Offsets (property field)
 	GetOffsets() []uint16
-	// GetServicesData returns ServicesData
+	// GetServicesData returns ServicesData (property field)
 	GetServicesData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/Services.go b/plc4go/internal/plc4go/eip/readwrite/model/Services.go
index 146a2bd..ca0568a 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/Services.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/Services.go
@@ -38,11 +38,11 @@ type Services struct {
 
 // The corresponding interface
 type IServices interface {
-	// GetServiceNb returns ServiceNb
+	// GetServiceNb returns ServiceNb (property field)
 	GetServiceNb() uint16
-	// GetOffsets returns Offsets
+	// GetOffsets returns Offsets (property field)
 	GetOffsets() []uint16
-	// GetServices returns Services
+	// GetServices returns Services (property field)
 	GetServices() []*CipService
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
index 1f2d32a..c1d0cbe 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
@@ -36,8 +36,8 @@ type FirmataCommand struct {
 
 // The corresponding interface
 type IFirmataCommand interface {
-	// CommandCode returns CommandCode
-	CommandCode() uint8
+	// GetCommandCode returns CommandCode (discriminator field)
+	GetCommandCode() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -159,7 +159,7 @@ func (m *FirmataCommand) SerializeParent(writeBuffer utils.WriteBuffer, child IF
 	}
 
 	// Discriminator Field (commandCode) (Used as input to a switch field)
-	commandCode := uint8(child.CommandCode())
+	commandCode := uint8(child.GetCommandCode())
 	_commandCodeErr := writeBuffer.WriteUint8("commandCode", 4, (commandCode))
 
 	if _commandCodeErr != nil {
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
index 1f747cf..e331f1d 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
@@ -39,9 +39,9 @@ type FirmataCommandProtocolVersion struct {
 // The corresponding interface
 type IFirmataCommandProtocolVersion interface {
 	IFirmataCommand
-	// GetMajorVersion returns MajorVersion
+	// GetMajorVersion returns MajorVersion (property field)
 	GetMajorVersion() uint8
-	// GetMinorVersion returns MinorVersion
+	// GetMinorVersion returns MinorVersion (property field)
 	GetMinorVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
index ea0d85a..09121b5 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
@@ -40,9 +40,9 @@ type FirmataCommandSetDigitalPinValue struct {
 // The corresponding interface
 type IFirmataCommandSetDigitalPinValue interface {
 	IFirmataCommand
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetOn returns On
+	// GetOn returns On (property field)
 	GetOn() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
index 460ce55..faab572 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
@@ -39,9 +39,9 @@ type FirmataCommandSetPinMode struct {
 // The corresponding interface
 type IFirmataCommandSetPinMode interface {
 	IFirmataCommand
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetMode returns Mode
+	// GetMode returns Mode (property field)
 	GetMode() PinMode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
index b5ebbf5..fa203b7 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
@@ -39,7 +39,7 @@ type FirmataCommandSysex struct {
 // The corresponding interface
 type IFirmataCommandSysex interface {
 	IFirmataCommand
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *SysexCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
index 20d8250..662e28e 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
@@ -36,8 +36,8 @@ type FirmataMessage struct {
 
 // The corresponding interface
 type IFirmataMessage interface {
-	// MessageType returns MessageType
-	MessageType() uint8
+	// GetMessageType returns MessageType (discriminator field)
+	GetMessageType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -159,7 +159,7 @@ func (m *FirmataMessage) SerializeParent(writeBuffer utils.WriteBuffer, child IF
 	}
 
 	// Discriminator Field (messageType) (Used as input to a switch field)
-	messageType := uint8(child.MessageType())
+	messageType := uint8(child.GetMessageType())
 	_messageTypeErr := writeBuffer.WriteUint8("messageType", 4, (messageType))
 
 	if _messageTypeErr != nil {
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
index 7e38537..69c1ee6 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
@@ -39,9 +39,9 @@ type FirmataMessageAnalogIO struct {
 // The corresponding interface
 type IFirmataMessageAnalogIO interface {
 	IFirmataMessage
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []int8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
index 560d44f..227e1d0 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
@@ -38,7 +38,7 @@ type FirmataMessageCommand struct {
 // The corresponding interface
 type IFirmataMessageCommand interface {
 	IFirmataMessage
-	// GetCommand returns Command
+	// GetCommand returns Command (property field)
 	GetCommand() *FirmataCommand
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
index 6d25101..990046c 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
@@ -39,9 +39,9 @@ type FirmataMessageDigitalIO struct {
 // The corresponding interface
 type IFirmataMessageDigitalIO interface {
 	IFirmataMessage
-	// GetPinBlock returns PinBlock
+	// GetPinBlock returns PinBlock (property field)
 	GetPinBlock() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []int8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
index 4311c59..b0aa8af 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
@@ -40,9 +40,9 @@ type FirmataMessageSubscribeAnalogPinValue struct {
 // The corresponding interface
 type IFirmataMessageSubscribeAnalogPinValue interface {
 	IFirmataMessage
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetEnable returns Enable
+	// GetEnable returns Enable (property field)
 	GetEnable() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
index c59fb97..b7db383 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
@@ -40,9 +40,9 @@ type FirmataMessageSubscribeDigitalPinValue struct {
 // The corresponding interface
 type IFirmataMessageSubscribeDigitalPinValue interface {
 	IFirmataMessage
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetEnable returns Enable
+	// GetEnable returns Enable (property field)
 	GetEnable() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
index 1a729d2..12af7cd 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
@@ -33,10 +33,10 @@ type SysexCommand struct {
 
 // The corresponding interface
 type ISysexCommand interface {
-	// CommandType returns CommandType
-	CommandType() uint8
-	// Response returns Response
-	Response() bool
+	// GetCommandType returns CommandType (discriminator field)
+	GetCommandType() uint8
+	// GetResponse returns Response (discriminator field)
+	GetResponse() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -178,7 +178,7 @@ func (m *SysexCommand) SerializeParent(writeBuffer utils.WriteBuffer, child ISys
 	}
 
 	// Discriminator Field (commandType) (Used as input to a switch field)
-	commandType := uint8(child.CommandType())
+	commandType := uint8(child.GetCommandType())
 	_commandTypeErr := writeBuffer.WriteUint8("commandType", 8, (commandType))
 
 	if _commandTypeErr != nil {
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
index a6feb5f..d854684 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
@@ -35,7 +35,7 @@ type SysexCommandAnalogMappingQueryResponse struct {
 // The corresponding interface
 type ISysexCommandAnalogMappingQueryResponse interface {
 	ISysexCommand
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
index 852903c..004c745 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
@@ -35,7 +35,7 @@ type SysexCommandExtendedId struct {
 // The corresponding interface
 type ISysexCommandExtendedId interface {
 	ISysexCommand
-	// GetId returns Id
+	// GetId returns Id (property field)
 	GetId() []int8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
index 05b5d5a..71d444e 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
@@ -35,7 +35,7 @@ type SysexCommandPinStateQuery struct {
 // The corresponding interface
 type ISysexCommandPinStateQuery interface {
 	ISysexCommand
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
index 1ee432d..3e86c87 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
@@ -37,11 +37,11 @@ type SysexCommandPinStateResponse struct {
 // The corresponding interface
 type ISysexCommandPinStateResponse interface {
 	ISysexCommand
-	// GetPin returns Pin
+	// GetPin returns Pin (property field)
 	GetPin() uint8
-	// GetPinMode returns PinMode
+	// GetPinMode returns PinMode (property field)
 	GetPinMode() uint8
-	// GetPinState returns PinState
+	// GetPinState returns PinState (property field)
 	GetPinState() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
index 7600b15..ba52641 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
@@ -37,11 +37,11 @@ type SysexCommandReportFirmwareResponse struct {
 // The corresponding interface
 type ISysexCommandReportFirmwareResponse interface {
 	ISysexCommand
-	// GetMajorVersion returns MajorVersion
+	// GetMajorVersion returns MajorVersion (property field)
 	GetMajorVersion() uint8
-	// GetMinorVersion returns MinorVersion
+	// GetMinorVersion returns MinorVersion (property field)
 	GetMinorVersion() uint8
-	// GetFileName returns FileName
+	// GetFileName returns FileName (property field)
 	GetFileName() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
index 6af239c..3c01f6a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
@@ -38,11 +38,11 @@ type Apdu struct {
 
 // The corresponding interface
 type IApdu interface {
-	// Control returns Control
-	Control() uint8
-	// GetNumbered returns Numbered
+	// GetControl returns Control (discriminator field)
+	GetControl() uint8
+	// GetNumbered returns Numbered (property field)
 	GetNumbered() bool
-	// GetCounter returns Counter
+	// GetCounter returns Counter (property field)
 	GetCounter() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -186,7 +186,7 @@ func (m *Apdu) SerializeParent(writeBuffer utils.WriteBuffer, child IApdu, seria
 	}
 
 	// Discriminator Field (control) (Used as input to a switch field)
-	control := uint8(child.Control())
+	control := uint8(child.GetControl())
 	_controlErr := writeBuffer.WriteUint8("control", 1, (control))
 
 	if _controlErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go
index 6d33688..47ba510 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go
@@ -33,8 +33,8 @@ type ApduControl struct {
 
 // The corresponding interface
 type IApduControl interface {
-	// ControlType returns ControlType
-	ControlType() uint8
+	// GetControlType returns ControlType (discriminator field)
+	GetControlType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -154,7 +154,7 @@ func (m *ApduControl) SerializeParent(writeBuffer utils.WriteBuffer, child IApdu
 	}
 
 	// Discriminator Field (controlType) (Used as input to a switch field)
-	controlType := uint8(child.ControlType())
+	controlType := uint8(child.GetControlType())
 	_controlTypeErr := writeBuffer.WriteUint8("controlType", 2, (controlType))
 
 	if _controlTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
index 6dbef38..371136e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
@@ -38,7 +38,7 @@ type ApduControlContainer struct {
 // The corresponding interface
 type IApduControlContainer interface {
 	IApdu
-	// GetControlApdu returns ControlApdu
+	// GetControlApdu returns ControlApdu (property field)
 	GetControlApdu() *ApduControl
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
index b79c5a9..a218ef8 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
@@ -36,8 +36,8 @@ type ApduData struct {
 
 // The corresponding interface
 type IApduData interface {
-	// ApciType returns ApciType
-	ApciType() uint8
+	// GetApciType returns ApciType (discriminator field)
+	GetApciType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -181,7 +181,7 @@ func (m *ApduData) SerializeParent(writeBuffer utils.WriteBuffer, child IApduDat
 	}
 
 	// Discriminator Field (apciType) (Used as input to a switch field)
-	apciType := uint8(child.ApciType())
+	apciType := uint8(child.GetApciType())
 	_apciTypeErr := writeBuffer.WriteUint8("apciType", 4, (apciType))
 
 	if _apciTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
index cd5bd82..9b25356 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
@@ -38,7 +38,7 @@ type ApduDataContainer struct {
 // The corresponding interface
 type IApduDataContainer interface {
 	IApdu
-	// GetDataApdu returns DataApdu
+	// GetDataApdu returns DataApdu (property field)
 	GetDataApdu() *ApduData
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
index 85a2256..8a59102 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
@@ -38,7 +38,7 @@ type ApduDataDeviceDescriptorRead struct {
 // The corresponding interface
 type IApduDataDeviceDescriptorRead interface {
 	IApduData
-	// GetDescriptorType returns DescriptorType
+	// GetDescriptorType returns DescriptorType (property field)
 	GetDescriptorType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index f4441f4..4b830cb 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -39,9 +39,9 @@ type ApduDataDeviceDescriptorResponse struct {
 // The corresponding interface
 type IApduDataDeviceDescriptorResponse interface {
 	IApduData
-	// GetDescriptorType returns DescriptorType
+	// GetDescriptorType returns DescriptorType (property field)
 	GetDescriptorType() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
index 25128f7..ae46cdd 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
@@ -36,8 +36,8 @@ type ApduDataExt struct {
 
 // The corresponding interface
 type IApduDataExt interface {
-	// ExtApciType returns ExtApciType
-	ExtApciType() uint8
+	// GetExtApciType returns ExtApciType (discriminator field)
+	GetExtApciType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -231,7 +231,7 @@ func (m *ApduDataExt) SerializeParent(writeBuffer utils.WriteBuffer, child IApdu
 	}
 
 	// Discriminator Field (extApciType) (Used as input to a switch field)
-	extApciType := uint8(child.ExtApciType())
+	extApciType := uint8(child.GetExtApciType())
 	_extApciTypeErr := writeBuffer.WriteUint8("extApciType", 6, (extApciType))
 
 	if _extApciTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
index 0260a47..d59b969 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
@@ -39,9 +39,9 @@ type ApduDataExtAuthorizeRequest struct {
 // The corresponding interface
 type IApduDataExtAuthorizeRequest interface {
 	IApduDataExt
-	// GetLevel returns Level
+	// GetLevel returns Level (property field)
 	GetLevel() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
index c4158ae..f3de791 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
@@ -38,7 +38,7 @@ type ApduDataExtAuthorizeResponse struct {
 // The corresponding interface
 type IApduDataExtAuthorizeResponse interface {
 	IApduDataExt
-	// GetLevel returns Level
+	// GetLevel returns Level (property field)
 	GetLevel() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
index f2b9012..67f67c6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
@@ -40,11 +40,11 @@ type ApduDataExtPropertyDescriptionRead struct {
 // The corresponding interface
 type IApduDataExtPropertyDescriptionRead interface {
 	IApduDataExt
-	// GetObjectIndex returns ObjectIndex
+	// GetObjectIndex returns ObjectIndex (property field)
 	GetObjectIndex() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetIndex returns Index
+	// GetIndex returns Index (property field)
 	GetIndex() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
index ff4d63a..380df63 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
@@ -46,21 +46,21 @@ type ApduDataExtPropertyDescriptionResponse struct {
 // The corresponding interface
 type IApduDataExtPropertyDescriptionResponse interface {
 	IApduDataExt
-	// GetObjectIndex returns ObjectIndex
+	// GetObjectIndex returns ObjectIndex (property field)
 	GetObjectIndex() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetIndex returns Index
+	// GetIndex returns Index (property field)
 	GetIndex() uint8
-	// GetWriteEnabled returns WriteEnabled
+	// GetWriteEnabled returns WriteEnabled (property field)
 	GetWriteEnabled() bool
-	// GetPropertyDataType returns PropertyDataType
+	// GetPropertyDataType returns PropertyDataType (property field)
 	GetPropertyDataType() KnxPropertyDataType
-	// GetMaxNrOfElements returns MaxNrOfElements
+	// GetMaxNrOfElements returns MaxNrOfElements (property field)
 	GetMaxNrOfElements() uint16
-	// GetReadLevel returns ReadLevel
+	// GetReadLevel returns ReadLevel (property field)
 	GetReadLevel() AccessLevel
-	// GetWriteLevel returns WriteLevel
+	// GetWriteLevel returns WriteLevel (property field)
 	GetWriteLevel() AccessLevel
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
index 7a38506..bc43518 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
@@ -41,13 +41,13 @@ type ApduDataExtPropertyValueRead struct {
 // The corresponding interface
 type IApduDataExtPropertyValueRead interface {
 	IApduDataExt
-	// GetObjectIndex returns ObjectIndex
+	// GetObjectIndex returns ObjectIndex (property field)
 	GetObjectIndex() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
-	// GetIndex returns Index
+	// GetIndex returns Index (property field)
 	GetIndex() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index 1555346..8775120 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -42,15 +42,15 @@ type ApduDataExtPropertyValueResponse struct {
 // The corresponding interface
 type IApduDataExtPropertyValueResponse interface {
 	IApduDataExt
-	// GetObjectIndex returns ObjectIndex
+	// GetObjectIndex returns ObjectIndex (property field)
 	GetObjectIndex() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
-	// GetIndex returns Index
+	// GetIndex returns Index (property field)
 	GetIndex() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index a1a4b08..610108b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -42,15 +42,15 @@ type ApduDataExtPropertyValueWrite struct {
 // The corresponding interface
 type IApduDataExtPropertyValueWrite interface {
 	IApduDataExt
-	// GetObjectIndex returns ObjectIndex
+	// GetObjectIndex returns ObjectIndex (property field)
 	GetObjectIndex() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetCount returns Count
+	// GetCount returns Count (property field)
 	GetCount() uint8
-	// GetIndex returns Index
+	// GetIndex returns Index (property field)
 	GetIndex() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index 6dd5676..de3aac8 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -39,9 +39,9 @@ type ApduDataGroupValueResponse struct {
 // The corresponding interface
 type IApduDataGroupValueResponse interface {
 	IApduData
-	// GetDataFirstByte returns DataFirstByte
+	// GetDataFirstByte returns DataFirstByte (property field)
 	GetDataFirstByte() int8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index ea2a387..1c3546f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -39,9 +39,9 @@ type ApduDataGroupValueWrite struct {
 // The corresponding interface
 type IApduDataGroupValueWrite interface {
 	IApduData
-	// GetDataFirstByte returns DataFirstByte
+	// GetDataFirstByte returns DataFirstByte (property field)
 	GetDataFirstByte() int8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
index 911b137..0be392c 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
@@ -39,9 +39,9 @@ type ApduDataMemoryRead struct {
 // The corresponding interface
 type IApduDataMemoryRead interface {
 	IApduData
-	// GetNumBytes returns NumBytes
+	// GetNumBytes returns NumBytes (property field)
 	GetNumBytes() uint8
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
index a53c85f..15edf1e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
@@ -39,9 +39,9 @@ type ApduDataMemoryResponse struct {
 // The corresponding interface
 type IApduDataMemoryResponse interface {
 	IApduData
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
index 4ca2478..fd44309 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
@@ -38,7 +38,7 @@ type ApduDataOther struct {
 // The corresponding interface
 type IApduDataOther interface {
 	IApduData
-	// GetExtendedApdu returns ExtendedApdu
+	// GetExtendedApdu returns ExtendedApdu (property field)
 	GetExtendedApdu() *ApduDataExt
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
index 5ab6455..6bfb72d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
@@ -36,8 +36,8 @@ type CEMI struct {
 
 // The corresponding interface
 type ICEMI interface {
-	// MessageCode returns MessageCode
-	MessageCode() uint8
+	// GetMessageCode returns MessageCode (discriminator field)
+	GetMessageCode() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -195,7 +195,7 @@ func (m *CEMI) SerializeParent(writeBuffer utils.WriteBuffer, child ICEMI, seria
 	}
 
 	// Discriminator Field (messageCode) (Used as input to a switch field)
-	messageCode := uint8(child.MessageCode())
+	messageCode := uint8(child.GetMessageCode())
 	_messageCodeErr := writeBuffer.WriteUint8("messageCode", 8, (messageCode))
 
 	if _messageCodeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
index 6043c86..671d302 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformation.go
@@ -33,8 +33,8 @@ type CEMIAdditionalInformation struct {
 
 // The corresponding interface
 type ICEMIAdditionalInformation interface {
-	// AdditionalInformationType returns AdditionalInformationType
-	AdditionalInformationType() uint8
+	// GetAdditionalInformationType returns AdditionalInformationType (discriminator field)
+	GetAdditionalInformationType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -150,7 +150,7 @@ func (m *CEMIAdditionalInformation) SerializeParent(writeBuffer utils.WriteBuffe
 	}
 
 	// Discriminator Field (additionalInformationType) (Used as input to a switch field)
-	additionalInformationType := uint8(child.AdditionalInformationType())
+	additionalInformationType := uint8(child.GetAdditionalInformationType())
 	_additionalInformationTypeErr := writeBuffer.WriteUint8("additionalInformationType", 8, (additionalInformationType))
 
 	if _additionalInformationTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
index 702c8fc..c014612 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
@@ -44,17 +44,17 @@ type CEMIAdditionalInformationBusmonitorInfo struct {
 // The corresponding interface
 type ICEMIAdditionalInformationBusmonitorInfo interface {
 	ICEMIAdditionalInformation
-	// GetFrameErrorFlag returns FrameErrorFlag
+	// GetFrameErrorFlag returns FrameErrorFlag (property field)
 	GetFrameErrorFlag() bool
-	// GetBitErrorFlag returns BitErrorFlag
+	// GetBitErrorFlag returns BitErrorFlag (property field)
 	GetBitErrorFlag() bool
-	// GetParityErrorFlag returns ParityErrorFlag
+	// GetParityErrorFlag returns ParityErrorFlag (property field)
 	GetParityErrorFlag() bool
-	// GetUnknownFlag returns UnknownFlag
+	// GetUnknownFlag returns UnknownFlag (property field)
 	GetUnknownFlag() bool
-	// GetLostFlag returns LostFlag
+	// GetLostFlag returns LostFlag (property field)
 	GetLostFlag() bool
-	// GetSequenceNumber returns SequenceNumber
+	// GetSequenceNumber returns SequenceNumber (property field)
 	GetSequenceNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
index 9c65f28..b288d75 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
@@ -39,7 +39,7 @@ type CEMIAdditionalInformationRelativeTimestamp struct {
 // The corresponding interface
 type ICEMIAdditionalInformationRelativeTimestamp interface {
 	ICEMIAdditionalInformation
-	// GetRelativeTimestamp returns RelativeTimestamp
+	// GetRelativeTimestamp returns RelativeTimestamp (property field)
 	GetRelativeTimestamp() *RelativeTimestamp
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go
index 1165543..34f5786 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go
@@ -34,9 +34,9 @@ type ChannelInformation struct {
 
 // The corresponding interface
 type IChannelInformation interface {
-	// GetNumChannels returns NumChannels
+	// GetNumChannels returns NumChannels (property field)
 	GetNumChannels() uint8
-	// GetChannelCode returns ChannelCode
+	// GetChannelCode returns ChannelCode (property field)
 	GetChannelCode() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
index c5fa2bb..3707bea 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
@@ -33,8 +33,8 @@ type ComObjectTable struct {
 
 // The corresponding interface
 type IComObjectTable interface {
-	// FirmwareType returns FirmwareType
-	FirmwareType() FirmwareType
+	// GetFirmwareType returns FirmwareType (discriminator field)
+	GetFirmwareType() FirmwareType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
index 6e711e1..cabf54c 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
@@ -37,11 +37,11 @@ type ComObjectTableRealisationType1 struct {
 // The corresponding interface
 type IComObjectTableRealisationType1 interface {
 	IComObjectTable
-	// GetNumEntries returns NumEntries
+	// GetNumEntries returns NumEntries (property field)
 	GetNumEntries() uint8
-	// GetRamFlagsTablePointer returns RamFlagsTablePointer
+	// GetRamFlagsTablePointer returns RamFlagsTablePointer (property field)
 	GetRamFlagsTablePointer() uint8
-	// GetComObjectDescriptors returns ComObjectDescriptors
+	// GetComObjectDescriptors returns ComObjectDescriptors (property field)
 	GetComObjectDescriptors() []*GroupObjectDescriptorRealisationType1
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
index 7cdd719..4dcbc8a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
@@ -37,11 +37,11 @@ type ComObjectTableRealisationType2 struct {
 // The corresponding interface
 type IComObjectTableRealisationType2 interface {
 	IComObjectTable
-	// GetNumEntries returns NumEntries
+	// GetNumEntries returns NumEntries (property field)
 	GetNumEntries() uint8
-	// GetRamFlagsTablePointer returns RamFlagsTablePointer
+	// GetRamFlagsTablePointer returns RamFlagsTablePointer (property field)
 	GetRamFlagsTablePointer() uint8
-	// GetComObjectDescriptors returns ComObjectDescriptors
+	// GetComObjectDescriptors returns ComObjectDescriptors (property field)
 	GetComObjectDescriptors() []*GroupObjectDescriptorRealisationType2
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
index b1730e7..2bc3854 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
@@ -35,7 +35,7 @@ type ComObjectTableRealisationType6 struct {
 // The corresponding interface
 type IComObjectTableRealisationType6 interface {
 	IComObjectTable
-	// GetComObjectDescriptors returns ComObjectDescriptors
+	// GetComObjectDescriptors returns ComObjectDescriptors (property field)
 	GetComObjectDescriptors() *GroupObjectDescriptorRealisationType6
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
index d987a43..638796b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
@@ -37,11 +37,11 @@ type ConnectionRequest struct {
 // The corresponding interface
 type IConnectionRequest interface {
 	IKnxNetIpMessage
-	// GetHpaiDiscoveryEndpoint returns HpaiDiscoveryEndpoint
+	// GetHpaiDiscoveryEndpoint returns HpaiDiscoveryEndpoint (property field)
 	GetHpaiDiscoveryEndpoint() *HPAIDiscoveryEndpoint
-	// GetHpaiDataEndpoint returns HpaiDataEndpoint
+	// GetHpaiDataEndpoint returns HpaiDataEndpoint (property field)
 	GetHpaiDataEndpoint() *HPAIDataEndpoint
-	// GetConnectionRequestInformation returns ConnectionRequestInformation
+	// GetConnectionRequestInformation returns ConnectionRequestInformation (property field)
 	GetConnectionRequestInformation() *ConnectionRequestInformation
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
index bf65d15..bcf5bfe 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformation.go
@@ -33,8 +33,8 @@ type ConnectionRequestInformation struct {
 
 // The corresponding interface
 type IConnectionRequestInformation interface {
-	// ConnectionType returns ConnectionType
-	ConnectionType() uint8
+	// GetConnectionType returns ConnectionType (discriminator field)
+	GetConnectionType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -167,7 +167,7 @@ func (m *ConnectionRequestInformation) SerializeParent(writeBuffer utils.WriteBu
 	}
 
 	// Discriminator Field (connectionType) (Used as input to a switch field)
-	connectionType := uint8(child.ConnectionType())
+	connectionType := uint8(child.GetConnectionType())
 	_connectionTypeErr := writeBuffer.WriteUint8("connectionType", 8, (connectionType))
 
 	if _connectionTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
index dafe266..99f6c8a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
@@ -36,7 +36,7 @@ type ConnectionRequestInformationTunnelConnection struct {
 // The corresponding interface
 type IConnectionRequestInformationTunnelConnection interface {
 	IConnectionRequestInformation
-	// GetKnxLayer returns KnxLayer
+	// GetKnxLayer returns KnxLayer (property field)
 	GetKnxLayer() KnxLayer
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
index d600070..bad207e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
@@ -39,13 +39,13 @@ type ConnectionResponse struct {
 // The corresponding interface
 type IConnectionResponse interface {
 	IKnxNetIpMessage
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() Status
-	// GetHpaiDataEndpoint returns HpaiDataEndpoint
+	// GetHpaiDataEndpoint returns HpaiDataEndpoint (property field)
 	GetHpaiDataEndpoint() *HPAIDataEndpoint
-	// GetConnectionResponseDataBlock returns ConnectionResponseDataBlock
+	// GetConnectionResponseDataBlock returns ConnectionResponseDataBlock (property field)
 	GetConnectionResponseDataBlock() *ConnectionResponseDataBlock
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
index e29c787..afbbc4e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlock.go
@@ -33,8 +33,8 @@ type ConnectionResponseDataBlock struct {
 
 // The corresponding interface
 type IConnectionResponseDataBlock interface {
-	// ConnectionType returns ConnectionType
-	ConnectionType() uint8
+	// GetConnectionType returns ConnectionType (discriminator field)
+	GetConnectionType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -167,7 +167,7 @@ func (m *ConnectionResponseDataBlock) SerializeParent(writeBuffer utils.WriteBuf
 	}
 
 	// Discriminator Field (connectionType) (Used as input to a switch field)
-	connectionType := uint8(child.ConnectionType())
+	connectionType := uint8(child.GetConnectionType())
 	_connectionTypeErr := writeBuffer.WriteUint8("connectionType", 8, (connectionType))
 
 	if _connectionTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
index 3dc1eea..c41f848 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
@@ -35,7 +35,7 @@ type ConnectionResponseDataBlockTunnelConnection struct {
 // The corresponding interface
 type IConnectionResponseDataBlockTunnelConnection interface {
 	IConnectionResponseDataBlock
-	// GetKnxAddress returns KnxAddress
+	// GetKnxAddress returns KnxAddress (property field)
 	GetKnxAddress() *KnxAddress
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
index 8d36809..1b4399e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
@@ -37,9 +37,9 @@ type ConnectionStateRequest struct {
 // The corresponding interface
 type IConnectionStateRequest interface {
 	IKnxNetIpMessage
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetHpaiControlEndpoint returns HpaiControlEndpoint
+	// GetHpaiControlEndpoint returns HpaiControlEndpoint (property field)
 	GetHpaiControlEndpoint() *HPAIControlEndpoint
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
index f8cd0a5..7bd63c9 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
@@ -36,9 +36,9 @@ type ConnectionStateResponse struct {
 // The corresponding interface
 type IConnectionStateResponse interface {
 	IKnxNetIpMessage
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() Status
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
index 71d85e9..9f59b04 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBDeviceInfo.go
@@ -41,23 +41,23 @@ type DIBDeviceInfo struct {
 
 // The corresponding interface
 type IDIBDeviceInfo interface {
-	// GetDescriptionType returns DescriptionType
+	// GetDescriptionType returns DescriptionType (property field)
 	GetDescriptionType() uint8
-	// GetKnxMedium returns KnxMedium
+	// GetKnxMedium returns KnxMedium (property field)
 	GetKnxMedium() KnxMedium
-	// GetDeviceStatus returns DeviceStatus
+	// GetDeviceStatus returns DeviceStatus (property field)
 	GetDeviceStatus() *DeviceStatus
-	// GetKnxAddress returns KnxAddress
+	// GetKnxAddress returns KnxAddress (property field)
 	GetKnxAddress() *KnxAddress
-	// GetProjectInstallationIdentifier returns ProjectInstallationIdentifier
+	// GetProjectInstallationIdentifier returns ProjectInstallationIdentifier (property field)
 	GetProjectInstallationIdentifier() *ProjectInstallationIdentifier
-	// GetKnxNetIpDeviceSerialNumber returns KnxNetIpDeviceSerialNumber
+	// GetKnxNetIpDeviceSerialNumber returns KnxNetIpDeviceSerialNumber (property field)
 	GetKnxNetIpDeviceSerialNumber() []byte
-	// GetKnxNetIpDeviceMulticastAddress returns KnxNetIpDeviceMulticastAddress
+	// GetKnxNetIpDeviceMulticastAddress returns KnxNetIpDeviceMulticastAddress (property field)
 	GetKnxNetIpDeviceMulticastAddress() *IPAddress
-	// GetKnxNetIpDeviceMacAddress returns KnxNetIpDeviceMacAddress
+	// GetKnxNetIpDeviceMacAddress returns KnxNetIpDeviceMacAddress (property field)
 	GetKnxNetIpDeviceMacAddress() *MACAddress
-	// GetDeviceFriendlyName returns DeviceFriendlyName
+	// GetDeviceFriendlyName returns DeviceFriendlyName (property field)
 	GetDeviceFriendlyName() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
index 77bdb90..638dbb6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DIBSuppSvcFamilies.go
@@ -34,9 +34,9 @@ type DIBSuppSvcFamilies struct {
 
 // The corresponding interface
 type IDIBSuppSvcFamilies interface {
-	// GetDescriptionType returns DescriptionType
+	// GetDescriptionType returns DescriptionType (property field)
 	GetDescriptionType() uint8
-	// GetServiceIds returns ServiceIds
+	// GetServiceIds returns ServiceIds (property field)
 	GetServiceIds() []*ServiceId
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
index bb1d308..6a4b083 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
@@ -35,7 +35,7 @@ type DescriptionRequest struct {
 // The corresponding interface
 type IDescriptionRequest interface {
 	IKnxNetIpMessage
-	// GetHpaiControlEndpoint returns HpaiControlEndpoint
+	// GetHpaiControlEndpoint returns HpaiControlEndpoint (property field)
 	GetHpaiControlEndpoint() *HPAIControlEndpoint
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
index c5c2ca8..c299303 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
@@ -36,9 +36,9 @@ type DescriptionResponse struct {
 // The corresponding interface
 type IDescriptionResponse interface {
 	IKnxNetIpMessage
-	// GetDibDeviceInfo returns DibDeviceInfo
+	// GetDibDeviceInfo returns DibDeviceInfo (property field)
 	GetDibDeviceInfo() *DIBDeviceInfo
-	// GetDibSuppSvcFamilies returns DibSuppSvcFamilies
+	// GetDibSuppSvcFamilies returns DibSuppSvcFamilies (property field)
 	GetDibSuppSvcFamilies() *DIBSuppSvcFamilies
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
index 1ad0658..f2e8c12 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
@@ -35,7 +35,7 @@ type DeviceConfigurationAck struct {
 // The corresponding interface
 type IDeviceConfigurationAck interface {
 	IKnxNetIpMessage
-	// GetDeviceConfigurationAckDataBlock returns DeviceConfigurationAckDataBlock
+	// GetDeviceConfigurationAckDataBlock returns DeviceConfigurationAckDataBlock (property field)
 	GetDeviceConfigurationAckDataBlock() *DeviceConfigurationAckDataBlock
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
index dbecb58..27a7e96 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAckDataBlock.go
@@ -35,11 +35,11 @@ type DeviceConfigurationAckDataBlock struct {
 
 // The corresponding interface
 type IDeviceConfigurationAckDataBlock interface {
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetSequenceCounter returns SequenceCounter
+	// GetSequenceCounter returns SequenceCounter (property field)
 	GetSequenceCounter() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() Status
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index 50f0219..61e3245 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -39,9 +39,9 @@ type DeviceConfigurationRequest struct {
 // The corresponding interface
 type IDeviceConfigurationRequest interface {
 	IKnxNetIpMessage
-	// GetDeviceConfigurationRequestDataBlock returns DeviceConfigurationRequestDataBlock
+	// GetDeviceConfigurationRequestDataBlock returns DeviceConfigurationRequestDataBlock (property field)
 	GetDeviceConfigurationRequestDataBlock() *DeviceConfigurationRequestDataBlock
-	// GetCemi returns Cemi
+	// GetCemi returns Cemi (property field)
 	GetCemi() *CEMI
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
index 3c57bce..29927f7 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequestDataBlock.go
@@ -35,9 +35,9 @@ type DeviceConfigurationRequestDataBlock struct {
 
 // The corresponding interface
 type IDeviceConfigurationRequestDataBlock interface {
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetSequenceCounter returns SequenceCounter
+	// GetSequenceCounter returns SequenceCounter (property field)
 	GetSequenceCounter() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go
index b3bb794..cc4efca 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go
@@ -42,25 +42,25 @@ type DeviceDescriptorType2 struct {
 
 // The corresponding interface
 type IDeviceDescriptorType2 interface {
-	// GetManufacturerId returns ManufacturerId
+	// GetManufacturerId returns ManufacturerId (property field)
 	GetManufacturerId() uint16
-	// GetDeviceType returns DeviceType
+	// GetDeviceType returns DeviceType (property field)
 	GetDeviceType() uint16
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
-	// GetReadSupported returns ReadSupported
+	// GetReadSupported returns ReadSupported (property field)
 	GetReadSupported() bool
-	// GetWriteSupported returns WriteSupported
+	// GetWriteSupported returns WriteSupported (property field)
 	GetWriteSupported() bool
-	// GetLogicalTagBase returns LogicalTagBase
+	// GetLogicalTagBase returns LogicalTagBase (property field)
 	GetLogicalTagBase() uint8
-	// GetChannelInfo1 returns ChannelInfo1
+	// GetChannelInfo1 returns ChannelInfo1 (property field)
 	GetChannelInfo1() *ChannelInformation
-	// GetChannelInfo2 returns ChannelInfo2
+	// GetChannelInfo2 returns ChannelInfo2 (property field)
 	GetChannelInfo2() *ChannelInformation
-	// GetChannelInfo3 returns ChannelInfo3
+	// GetChannelInfo3 returns ChannelInfo3 (property field)
 	GetChannelInfo3() *ChannelInformation
-	// GetChannelInfo4 returns ChannelInfo4
+	// GetChannelInfo4 returns ChannelInfo4 (property field)
 	GetChannelInfo4() *ChannelInformation
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go
index 33d4d97..ce8f785 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceStatus.go
@@ -34,7 +34,7 @@ type DeviceStatus struct {
 
 // The corresponding interface
 type IDeviceStatus interface {
-	// GetProgramMode returns ProgramMode
+	// GetProgramMode returns ProgramMode (property field)
 	GetProgramMode() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
index c9971b6..2d691c5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
@@ -37,9 +37,9 @@ type DisconnectRequest struct {
 // The corresponding interface
 type IDisconnectRequest interface {
 	IKnxNetIpMessage
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetHpaiControlEndpoint returns HpaiControlEndpoint
+	// GetHpaiControlEndpoint returns HpaiControlEndpoint (property field)
 	GetHpaiControlEndpoint() *HPAIControlEndpoint
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
index 315501f..cb62641 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
@@ -36,9 +36,9 @@ type DisconnectResponse struct {
 // The corresponding interface
 type IDisconnectResponse interface {
 	IKnxNetIpMessage
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() Status
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
index 51d652e..692752b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType1.go
@@ -41,21 +41,21 @@ type GroupObjectDescriptorRealisationType1 struct {
 
 // The corresponding interface
 type IGroupObjectDescriptorRealisationType1 interface {
-	// GetDataPointer returns DataPointer
+	// GetDataPointer returns DataPointer (property field)
 	GetDataPointer() uint8
-	// GetTransmitEnable returns TransmitEnable
+	// GetTransmitEnable returns TransmitEnable (property field)
 	GetTransmitEnable() bool
-	// GetSegmentSelectorEnable returns SegmentSelectorEnable
+	// GetSegmentSelectorEnable returns SegmentSelectorEnable (property field)
 	GetSegmentSelectorEnable() bool
-	// GetWriteEnable returns WriteEnable
+	// GetWriteEnable returns WriteEnable (property field)
 	GetWriteEnable() bool
-	// GetReadEnable returns ReadEnable
+	// GetReadEnable returns ReadEnable (property field)
 	GetReadEnable() bool
-	// GetCommunicationEnable returns CommunicationEnable
+	// GetCommunicationEnable returns CommunicationEnable (property field)
 	GetCommunicationEnable() bool
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() CEMIPriority
-	// GetValueType returns ValueType
+	// GetValueType returns ValueType (property field)
 	GetValueType() ComObjectValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
index 5b4a5de..a063cf3 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType2.go
@@ -41,23 +41,23 @@ type GroupObjectDescriptorRealisationType2 struct {
 
 // The corresponding interface
 type IGroupObjectDescriptorRealisationType2 interface {
-	// GetDataPointer returns DataPointer
+	// GetDataPointer returns DataPointer (property field)
 	GetDataPointer() uint8
-	// GetUpdateEnable returns UpdateEnable
+	// GetUpdateEnable returns UpdateEnable (property field)
 	GetUpdateEnable() bool
-	// GetTransmitEnable returns TransmitEnable
+	// GetTransmitEnable returns TransmitEnable (property field)
 	GetTransmitEnable() bool
-	// GetSegmentSelectorEnable returns SegmentSelectorEnable
+	// GetSegmentSelectorEnable returns SegmentSelectorEnable (property field)
 	GetSegmentSelectorEnable() bool
-	// GetWriteEnable returns WriteEnable
+	// GetWriteEnable returns WriteEnable (property field)
 	GetWriteEnable() bool
-	// GetReadEnable returns ReadEnable
+	// GetReadEnable returns ReadEnable (property field)
 	GetReadEnable() bool
-	// GetCommunicationEnable returns CommunicationEnable
+	// GetCommunicationEnable returns CommunicationEnable (property field)
 	GetCommunicationEnable() bool
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() CEMIPriority
-	// GetValueType returns ValueType
+	// GetValueType returns ValueType (property field)
 	GetValueType() ComObjectValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
index e1f3f96..1a73130 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationType7.go
@@ -41,23 +41,23 @@ type GroupObjectDescriptorRealisationType7 struct {
 
 // The corresponding interface
 type IGroupObjectDescriptorRealisationType7 interface {
-	// GetDataAddress returns DataAddress
+	// GetDataAddress returns DataAddress (property field)
 	GetDataAddress() uint16
-	// GetUpdateEnable returns UpdateEnable
+	// GetUpdateEnable returns UpdateEnable (property field)
 	GetUpdateEnable() bool
-	// GetTransmitEnable returns TransmitEnable
+	// GetTransmitEnable returns TransmitEnable (property field)
 	GetTransmitEnable() bool
-	// GetSegmentSelectorEnable returns SegmentSelectorEnable
+	// GetSegmentSelectorEnable returns SegmentSelectorEnable (property field)
 	GetSegmentSelectorEnable() bool
-	// GetWriteEnable returns WriteEnable
+	// GetWriteEnable returns WriteEnable (property field)
 	GetWriteEnable() bool
-	// GetReadEnable returns ReadEnable
+	// GetReadEnable returns ReadEnable (property field)
 	GetReadEnable() bool
-	// GetCommunicationEnable returns CommunicationEnable
+	// GetCommunicationEnable returns CommunicationEnable (property field)
 	GetCommunicationEnable() bool
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() CEMIPriority
-	// GetValueType returns ValueType
+	// GetValueType returns ValueType (property field)
 	GetValueType() ComObjectValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
index 66e2e87..1245185 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/GroupObjectDescriptorRealisationTypeB.go
@@ -40,21 +40,21 @@ type GroupObjectDescriptorRealisationTypeB struct {
 
 // The corresponding interface
 type IGroupObjectDescriptorRealisationTypeB interface {
-	// GetUpdateEnable returns UpdateEnable
+	// GetUpdateEnable returns UpdateEnable (property field)
 	GetUpdateEnable() bool
-	// GetTransmitEnable returns TransmitEnable
+	// GetTransmitEnable returns TransmitEnable (property field)
 	GetTransmitEnable() bool
-	// GetSegmentSelectorEnable returns SegmentSelectorEnable
+	// GetSegmentSelectorEnable returns SegmentSelectorEnable (property field)
 	GetSegmentSelectorEnable() bool
-	// GetWriteEnable returns WriteEnable
+	// GetWriteEnable returns WriteEnable (property field)
 	GetWriteEnable() bool
-	// GetReadEnable returns ReadEnable
+	// GetReadEnable returns ReadEnable (property field)
 	GetReadEnable() bool
-	// GetCommunicationEnable returns CommunicationEnable
+	// GetCommunicationEnable returns CommunicationEnable (property field)
 	GetCommunicationEnable() bool
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() CEMIPriority
-	// GetValueType returns ValueType
+	// GetValueType returns ValueType (property field)
 	GetValueType() ComObjectValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
index 3a8fc17..5766767 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIControlEndpoint.go
@@ -35,11 +35,11 @@ type HPAIControlEndpoint struct {
 
 // The corresponding interface
 type IHPAIControlEndpoint interface {
-	// GetHostProtocolCode returns HostProtocolCode
+	// GetHostProtocolCode returns HostProtocolCode (property field)
 	GetHostProtocolCode() HostProtocolCode
-	// GetIpAddress returns IpAddress
+	// GetIpAddress returns IpAddress (property field)
 	GetIpAddress() *IPAddress
-	// GetIpPort returns IpPort
+	// GetIpPort returns IpPort (property field)
 	GetIpPort() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
index daca9c5..f078779 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDataEndpoint.go
@@ -35,11 +35,11 @@ type HPAIDataEndpoint struct {
 
 // The corresponding interface
 type IHPAIDataEndpoint interface {
-	// GetHostProtocolCode returns HostProtocolCode
+	// GetHostProtocolCode returns HostProtocolCode (property field)
 	GetHostProtocolCode() HostProtocolCode
-	// GetIpAddress returns IpAddress
+	// GetIpAddress returns IpAddress (property field)
 	GetIpAddress() *IPAddress
-	// GetIpPort returns IpPort
+	// GetIpPort returns IpPort (property field)
 	GetIpPort() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
index 8b9c7ce..8c4568f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/HPAIDiscoveryEndpoint.go
@@ -35,11 +35,11 @@ type HPAIDiscoveryEndpoint struct {
 
 // The corresponding interface
 type IHPAIDiscoveryEndpoint interface {
-	// GetHostProtocolCode returns HostProtocolCode
+	// GetHostProtocolCode returns HostProtocolCode (property field)
 	GetHostProtocolCode() HostProtocolCode
-	// GetIpAddress returns IpAddress
+	// GetIpAddress returns IpAddress (property field)
 	GetIpAddress() *IPAddress
-	// GetIpPort returns IpPort
+	// GetIpPort returns IpPort (property field)
 	GetIpPort() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
index 6ba4924..4cd850e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/IPAddress.go
@@ -33,7 +33,7 @@ type IPAddress struct {
 
 // The corresponding interface
 type IIPAddress interface {
-	// GetAddr returns Addr
+	// GetAddr returns Addr (property field)
 	GetAddr() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go
index 6e92247..8fd9a75 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxAddress.go
@@ -35,11 +35,11 @@ type KnxAddress struct {
 
 // The corresponding interface
 type IKnxAddress interface {
-	// GetMainGroup returns MainGroup
+	// GetMainGroup returns MainGroup (property field)
 	GetMainGroup() uint8
-	// GetMiddleGroup returns MiddleGroup
+	// GetMiddleGroup returns MiddleGroup (property field)
 	GetMiddleGroup() uint8
-	// GetSubGroup returns SubGroup
+	// GetSubGroup returns SubGroup (property field)
 	GetSubGroup() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
index 3ae9e9f..b926d71 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
@@ -33,8 +33,8 @@ type KnxGroupAddress struct {
 
 // The corresponding interface
 type IKnxGroupAddress interface {
-	// NumLevels returns NumLevels
-	NumLevels() uint8
+	// GetNumLevels returns NumLevels (discriminator field)
+	GetNumLevels() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
index 6ce9bba..1c2f8b4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
@@ -36,9 +36,9 @@ type KnxGroupAddress2Level struct {
 // The corresponding interface
 type IKnxGroupAddress2Level interface {
 	IKnxGroupAddress
-	// GetMainGroup returns MainGroup
+	// GetMainGroup returns MainGroup (property field)
 	GetMainGroup() uint8
-	// GetSubGroup returns SubGroup
+	// GetSubGroup returns SubGroup (property field)
 	GetSubGroup() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
index 6b3caa6..fca0450 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
@@ -37,11 +37,11 @@ type KnxGroupAddress3Level struct {
 // The corresponding interface
 type IKnxGroupAddress3Level interface {
 	IKnxGroupAddress
-	// GetMainGroup returns MainGroup
+	// GetMainGroup returns MainGroup (property field)
 	GetMainGroup() uint8
-	// GetMiddleGroup returns MiddleGroup
+	// GetMiddleGroup returns MiddleGroup (property field)
 	GetMiddleGroup() uint8
-	// GetSubGroup returns SubGroup
+	// GetSubGroup returns SubGroup (property field)
 	GetSubGroup() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
index efea9e8..cd169b1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
@@ -35,7 +35,7 @@ type KnxGroupAddressFreeLevel struct {
 // The corresponding interface
 type IKnxGroupAddressFreeLevel interface {
 	IKnxGroupAddress
-	// GetSubGroup returns SubGroup
+	// GetSubGroup returns SubGroup (property field)
 	GetSubGroup() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
index 7f5454e..7c6c57d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
@@ -35,7 +35,7 @@ type KnxNetIpCore struct {
 // The corresponding interface
 type IKnxNetIpCore interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
index ca6d9f8..17df084 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
@@ -35,7 +35,7 @@ type KnxNetIpDeviceManagement struct {
 // The corresponding interface
 type IKnxNetIpDeviceManagement interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go
index f2a5696..43fca88 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpMessage.go
@@ -37,8 +37,8 @@ type KnxNetIpMessage struct {
 
 // The corresponding interface
 type IKnxNetIpMessage interface {
-	// MsgType returns MsgType
-	MsgType() uint16
+	// GetMsgType returns MsgType (discriminator field)
+	GetMsgType() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -227,7 +227,7 @@ func (m *KnxNetIpMessage) SerializeParent(writeBuffer utils.WriteBuffer, child I
 	}
 
 	// Discriminator Field (msgType) (Used as input to a switch field)
-	msgType := uint16(child.MsgType())
+	msgType := uint16(child.GetMsgType())
 	_msgTypeErr := writeBuffer.WriteUint16("msgType", 16, (msgType))
 
 	if _msgTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
index a044447..cb8c052 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
@@ -35,7 +35,7 @@ type KnxNetIpRouting struct {
 // The corresponding interface
 type IKnxNetIpRouting interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
index 74aab4d..9b44555 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
@@ -35,7 +35,7 @@ type KnxNetIpTunneling struct {
 // The corresponding interface
 type IKnxNetIpTunneling interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
index 86cf68d..2ed45ed 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
@@ -35,7 +35,7 @@ type KnxNetObjectServer struct {
 // The corresponding interface
 type IKnxNetObjectServer interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
index 0c1fdbb..bc681c4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
@@ -35,7 +35,7 @@ type KnxNetRemoteConfigurationAndDiagnosis struct {
 // The corresponding interface
 type IKnxNetRemoteConfigurationAndDiagnosis interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
index f46286a..4ea3d4b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
@@ -35,7 +35,7 @@ type KnxNetRemoteLogging struct {
 // The corresponding interface
 type IKnxNetRemoteLogging interface {
 	IServiceId
-	// GetVersion returns Version
+	// GetVersion returns Version (property field)
 	GetVersion() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
index 88b64c7..37ce737 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
@@ -41,13 +41,13 @@ type LBusmonInd struct {
 // The corresponding interface
 type ILBusmonInd interface {
 	ICEMI
-	// GetAdditionalInformationLength returns AdditionalInformationLength
+	// GetAdditionalInformationLength returns AdditionalInformationLength (property field)
 	GetAdditionalInformationLength() uint8
-	// GetAdditionalInformation returns AdditionalInformation
+	// GetAdditionalInformation returns AdditionalInformation (property field)
 	GetAdditionalInformation() []*CEMIAdditionalInformation
-	// GetDataFrame returns DataFrame
+	// GetDataFrame returns DataFrame (property field)
 	GetDataFrame() *LDataFrame
-	// GetCrc returns Crc
+	// GetCrc returns Crc (property field)
 	GetCrc() *uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -208,7 +208,7 @@ func LBusmonIndParse(readBuffer utils.ReadBuffer, size uint16) (*CEMI, error) {
 
 	// Optional Field (crc) (Can be skipped, if a given expression evaluates to false)
 	var crc *uint8 = nil
-	if CastLDataFrame(dataFrame).Child.NotAckFrame() {
+	if CastLDataFrame(dataFrame).Child.GetNotAckFrame() {
 		_val, _err := readBuffer.ReadUint8("crc", 8)
 		if _err != nil {
 			return nil, errors.Wrap(_err, "Error parsing 'crc' field")
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
index fcf9789..1bce3c4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
@@ -40,11 +40,11 @@ type LDataCon struct {
 // The corresponding interface
 type ILDataCon interface {
 	ICEMI
-	// GetAdditionalInformationLength returns AdditionalInformationLength
+	// GetAdditionalInformationLength returns AdditionalInformationLength (property field)
 	GetAdditionalInformationLength() uint8
-	// GetAdditionalInformation returns AdditionalInformation
+	// GetAdditionalInformation returns AdditionalInformation (property field)
 	GetAdditionalInformation() []*CEMIAdditionalInformation
-	// GetDataFrame returns DataFrame
+	// GetDataFrame returns DataFrame (property field)
 	GetDataFrame() *LDataFrame
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
index 6ec1e2c..05e8dc0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
@@ -40,17 +40,17 @@ type LDataExtended struct {
 // The corresponding interface
 type ILDataExtended interface {
 	ILDataFrame
-	// GetGroupAddress returns GroupAddress
+	// GetGroupAddress returns GroupAddress (property field)
 	GetGroupAddress() bool
-	// GetHopCount returns HopCount
+	// GetHopCount returns HopCount (property field)
 	GetHopCount() uint8
-	// GetExtendedFrameFormat returns ExtendedFrameFormat
+	// GetExtendedFrameFormat returns ExtendedFrameFormat (property field)
 	GetExtendedFrameFormat() uint8
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() *KnxAddress
-	// GetDestinationAddress returns DestinationAddress
+	// GetDestinationAddress returns DestinationAddress (property field)
 	GetDestinationAddress() []byte
-	// GetApdu returns Apdu
+	// GetApdu returns Apdu (property field)
 	GetApdu() *Apdu
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
index 310b648..f13a31a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrame.go
@@ -38,19 +38,19 @@ type LDataFrame struct {
 
 // The corresponding interface
 type ILDataFrame interface {
-	// NotAckFrame returns NotAckFrame
-	NotAckFrame() bool
-	// Polling returns Polling
-	Polling() bool
-	// GetFrameType returns FrameType
+	// GetNotAckFrame returns NotAckFrame (discriminator field)
+	GetNotAckFrame() bool
+	// GetPolling returns Polling (discriminator field)
+	GetPolling() bool
+	// GetFrameType returns FrameType (property field)
 	GetFrameType() bool
-	// GetNotRepeated returns NotRepeated
+	// GetNotRepeated returns NotRepeated (property field)
 	GetNotRepeated() bool
-	// GetPriority returns Priority
+	// GetPriority returns Priority (property field)
 	GetPriority() CEMIPriority
-	// GetAcknowledgeRequested returns AcknowledgeRequested
+	// GetAcknowledgeRequested returns AcknowledgeRequested (property field)
 	GetAcknowledgeRequested() bool
-	// GetErrorFlag returns ErrorFlag
+	// GetErrorFlag returns ErrorFlag (property field)
 	GetErrorFlag() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -259,7 +259,7 @@ func (m *LDataFrame) SerializeParent(writeBuffer utils.WriteBuffer, child ILData
 	}
 
 	// Discriminator Field (polling) (Used as input to a switch field)
-	polling := bool(child.Polling())
+	polling := bool(child.GetPolling())
 	_pollingErr := writeBuffer.WriteBit("polling", (polling))
 
 	if _pollingErr != nil {
@@ -274,7 +274,7 @@ func (m *LDataFrame) SerializeParent(writeBuffer utils.WriteBuffer, child ILData
 	}
 
 	// Discriminator Field (notAckFrame) (Used as input to a switch field)
-	notAckFrame := bool(child.NotAckFrame())
+	notAckFrame := bool(child.GetNotAckFrame())
 	_notAckFrameErr := writeBuffer.WriteBit("notAckFrame", (notAckFrame))
 
 	if _notAckFrameErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
index 4724517..0281aba 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
@@ -40,11 +40,11 @@ type LDataInd struct {
 // The corresponding interface
 type ILDataInd interface {
 	ICEMI
-	// GetAdditionalInformationLength returns AdditionalInformationLength
+	// GetAdditionalInformationLength returns AdditionalInformationLength (property field)
 	GetAdditionalInformationLength() uint8
-	// GetAdditionalInformation returns AdditionalInformation
+	// GetAdditionalInformation returns AdditionalInformation (property field)
 	GetAdditionalInformation() []*CEMIAdditionalInformation
-	// GetDataFrame returns DataFrame
+	// GetDataFrame returns DataFrame (property field)
 	GetDataFrame() *LDataFrame
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
index fc8accb..4c367c4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
@@ -40,11 +40,11 @@ type LDataReq struct {
 // The corresponding interface
 type ILDataReq interface {
 	ICEMI
-	// GetAdditionalInformationLength returns AdditionalInformationLength
+	// GetAdditionalInformationLength returns AdditionalInformationLength (property field)
 	GetAdditionalInformationLength() uint8
-	// GetAdditionalInformation returns AdditionalInformation
+	// GetAdditionalInformation returns AdditionalInformation (property field)
 	GetAdditionalInformation() []*CEMIAdditionalInformation
-	// GetDataFrame returns DataFrame
+	// GetDataFrame returns DataFrame (property field)
 	GetDataFrame() *LDataFrame
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
index a06bf3d..b12c568 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
@@ -38,11 +38,11 @@ type LPollData struct {
 // The corresponding interface
 type ILPollData interface {
 	ILDataFrame
-	// GetSourceAddress returns SourceAddress
+	// GetSourceAddress returns SourceAddress (property field)
 	GetSourceAddress() *KnxAddress
-	// GetTargetAddress returns TargetAddress
+	// GetTargetAddress returns TargetAddress (property field)
 	GetTargetAddress() []byte
-	// GetNumberExpectedPollData returns NumberExpectedPollData
+	// GetNumberExpectedPollData returns NumberExpectedPollData (property field)
 	GetNumberExpectedPollData() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
index 8e42b5a..e2b56bb 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MACAddress.go
@@ -33,7 +33,7 @@ type MACAddress struct {
 
 // The corresponding interface
 type IMACAddress interface {
-	// GetAddr returns Addr
+	// GetAddr returns Addr (property field)
 	GetAddr() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
index b2a5034..21efb7e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
@@ -43,17 +43,17 @@ type MPropReadCon struct {
 // The corresponding interface
 type IMPropReadCon interface {
 	ICEMI
-	// GetInterfaceObjectType returns InterfaceObjectType
+	// GetInterfaceObjectType returns InterfaceObjectType (property field)
 	GetInterfaceObjectType() uint16
-	// GetObjectInstance returns ObjectInstance
+	// GetObjectInstance returns ObjectInstance (property field)
 	GetObjectInstance() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetNumberOfElements returns NumberOfElements
+	// GetNumberOfElements returns NumberOfElements (property field)
 	GetNumberOfElements() uint8
-	// GetStartIndex returns StartIndex
+	// GetStartIndex returns StartIndex (property field)
 	GetStartIndex() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
index fa637af..6b7c94f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
@@ -42,15 +42,15 @@ type MPropReadReq struct {
 // The corresponding interface
 type IMPropReadReq interface {
 	ICEMI
-	// GetInterfaceObjectType returns InterfaceObjectType
+	// GetInterfaceObjectType returns InterfaceObjectType (property field)
 	GetInterfaceObjectType() uint16
-	// GetObjectInstance returns ObjectInstance
+	// GetObjectInstance returns ObjectInstance (property field)
 	GetObjectInstance() uint8
-	// GetPropertyId returns PropertyId
+	// GetPropertyId returns PropertyId (property field)
 	GetPropertyId() uint8
-	// GetNumberOfElements returns NumberOfElements
+	// GetNumberOfElements returns NumberOfElements (property field)
 	GetNumberOfElements() uint8
-	// GetStartIndex returns StartIndex
+	// GetStartIndex returns StartIndex (property field)
 	GetStartIndex() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
index 46f7d15..b1886d0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ProjectInstallationIdentifier.go
@@ -34,9 +34,9 @@ type ProjectInstallationIdentifier struct {
 
 // The corresponding interface
 type IProjectInstallationIdentifier interface {
-	// GetProjectNumber returns ProjectNumber
+	// GetProjectNumber returns ProjectNumber (property field)
 	GetProjectNumber() uint8
-	// GetInstallationNumber returns InstallationNumber
+	// GetInstallationNumber returns InstallationNumber (property field)
 	GetInstallationNumber() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
index 97264b8..fbdc036 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/RelativeTimestamp.go
@@ -33,7 +33,7 @@ type RelativeTimestamp struct {
 
 // The corresponding interface
 type IRelativeTimestamp interface {
-	// GetTimestamp returns Timestamp
+	// GetTimestamp returns Timestamp (property field)
 	GetTimestamp() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
index ae3173d..9e37823 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
@@ -35,7 +35,7 @@ type SearchRequest struct {
 // The corresponding interface
 type ISearchRequest interface {
 	IKnxNetIpMessage
-	// GetHpaiIDiscoveryEndpoint returns HpaiIDiscoveryEndpoint
+	// GetHpaiIDiscoveryEndpoint returns HpaiIDiscoveryEndpoint (property field)
 	GetHpaiIDiscoveryEndpoint() *HPAIDiscoveryEndpoint
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
index 1c3f8dd..dde5d07 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
@@ -37,11 +37,11 @@ type SearchResponse struct {
 // The corresponding interface
 type ISearchResponse interface {
 	IKnxNetIpMessage
-	// GetHpaiControlEndpoint returns HpaiControlEndpoint
+	// GetHpaiControlEndpoint returns HpaiControlEndpoint (property field)
 	GetHpaiControlEndpoint() *HPAIControlEndpoint
-	// GetDibDeviceInfo returns DibDeviceInfo
+	// GetDibDeviceInfo returns DibDeviceInfo (property field)
 	GetDibDeviceInfo() *DIBDeviceInfo
-	// GetDibSuppSvcFamilies returns DibSuppSvcFamilies
+	// GetDibSuppSvcFamilies returns DibSuppSvcFamilies (property field)
 	GetDibSuppSvcFamilies() *DIBSuppSvcFamilies
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
index 947c987..c65c762 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ServiceId.go
@@ -33,8 +33,8 @@ type ServiceId struct {
 
 // The corresponding interface
 type IServiceId interface {
-	// ServiceType returns ServiceType
-	ServiceType() uint8
+	// GetServiceType returns ServiceType (discriminator field)
+	GetServiceType() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -160,7 +160,7 @@ func (m *ServiceId) SerializeParent(writeBuffer utils.WriteBuffer, child IServic
 	}
 
 	// Discriminator Field (serviceType) (Used as input to a switch field)
-	serviceType := uint8(child.ServiceType())
+	serviceType := uint8(child.GetServiceType())
 	_serviceTypeErr := writeBuffer.WriteUint8("serviceType", 8, (serviceType))
 
 	if _serviceTypeErr != nil {
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
index b0fb27b..1568ba7 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
@@ -39,9 +39,9 @@ type TunnelingRequest struct {
 // The corresponding interface
 type ITunnelingRequest interface {
 	IKnxNetIpMessage
-	// GetTunnelingRequestDataBlock returns TunnelingRequestDataBlock
+	// GetTunnelingRequestDataBlock returns TunnelingRequestDataBlock (property field)
 	GetTunnelingRequestDataBlock() *TunnelingRequestDataBlock
-	// GetCemi returns Cemi
+	// GetCemi returns Cemi (property field)
 	GetCemi() *CEMI
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
index 49a4c58..20b5716 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequestDataBlock.go
@@ -35,9 +35,9 @@ type TunnelingRequestDataBlock struct {
 
 // The corresponding interface
 type ITunnelingRequestDataBlock interface {
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetSequenceCounter returns SequenceCounter
+	// GetSequenceCounter returns SequenceCounter (property field)
 	GetSequenceCounter() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
index a946bf9..113fd4a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
@@ -35,7 +35,7 @@ type TunnelingResponse struct {
 // The corresponding interface
 type ITunnelingResponse interface {
 	IKnxNetIpMessage
-	// GetTunnelingResponseDataBlock returns TunnelingResponseDataBlock
+	// GetTunnelingResponseDataBlock returns TunnelingResponseDataBlock (property field)
 	GetTunnelingResponseDataBlock() *TunnelingResponseDataBlock
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
index 2f8edc8..40f0b30 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponseDataBlock.go
@@ -35,11 +35,11 @@ type TunnelingResponseDataBlock struct {
 
 // The corresponding interface
 type ITunnelingResponseDataBlock interface {
-	// GetCommunicationChannelId returns CommunicationChannelId
+	// GetCommunicationChannelId returns CommunicationChannelId (property field)
 	GetCommunicationChannelId() uint8
-	// GetSequenceCounter returns SequenceCounter
+	// GetSequenceCounter returns SequenceCounter (property field)
 	GetSequenceCounter() uint8
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() Status
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
index aac66ad..14d8217 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
@@ -38,7 +38,7 @@ type UnknownMessage struct {
 // The corresponding interface
 type IUnknownMessage interface {
 	IKnxNetIpMessage
-	// GetUnknownData returns UnknownData
+	// GetUnknownData returns UnknownData (property field)
 	GetUnknownData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDeviceInformationObject.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDeviceInformationObject.go
index e9f9350..8c1ae0a 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDeviceInformationObject.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusDeviceInformationObject.go
@@ -34,9 +34,9 @@ type ModbusDeviceInformationObject struct {
 
 // The corresponding interface
 type IModbusDeviceInformationObject interface {
-	// GetObjectId returns ObjectId
+	// GetObjectId returns ObjectId (property field)
 	GetObjectId() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
index 0b02f90..b3eb78e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
@@ -33,12 +33,12 @@ type ModbusPDU struct {
 
 // The corresponding interface
 type IModbusPDU interface {
-	// ErrorFlag returns ErrorFlag
-	ErrorFlag() bool
-	// FunctionFlag returns FunctionFlag
-	FunctionFlag() uint8
-	// Response returns Response
-	Response() bool
+	// GetErrorFlag returns ErrorFlag (discriminator field)
+	GetErrorFlag() bool
+	// GetFunctionFlag returns FunctionFlag (discriminator field)
+	GetFunctionFlag() uint8
+	// GetResponse returns Response (discriminator field)
+	GetResponse() bool
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -236,7 +236,7 @@ func (m *ModbusPDU) SerializeParent(writeBuffer utils.WriteBuffer, child IModbus
 	}
 
 	// Discriminator Field (errorFlag) (Used as input to a switch field)
-	errorFlag := bool(child.ErrorFlag())
+	errorFlag := bool(child.GetErrorFlag())
 	_errorFlagErr := writeBuffer.WriteBit("errorFlag", (errorFlag))
 
 	if _errorFlagErr != nil {
@@ -244,7 +244,7 @@ func (m *ModbusPDU) SerializeParent(writeBuffer utils.WriteBuffer, child IModbus
 	}
 
 	// Discriminator Field (functionFlag) (Used as input to a switch field)
-	functionFlag := uint8(child.FunctionFlag())
+	functionFlag := uint8(child.GetFunctionFlag())
 	_functionFlagErr := writeBuffer.WriteUint8("functionFlag", 7, (functionFlag))
 
 	if _functionFlagErr != nil {
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
index 4a5bfa8..fbb2dd8 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUDiagnosticRequest struct {
 // The corresponding interface
 type IModbusPDUDiagnosticRequest interface {
 	IModbusPDU
-	// GetSubFunction returns SubFunction
+	// GetSubFunction returns SubFunction (property field)
 	GetSubFunction() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
index 25a3808..4421c88 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUDiagnosticResponse struct {
 // The corresponding interface
 type IModbusPDUDiagnosticResponse interface {
 	IModbusPDU
-	// GetSubFunction returns SubFunction
+	// GetSubFunction returns SubFunction (property field)
 	GetSubFunction() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
index edcfe7f..c690bc7 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
@@ -35,7 +35,7 @@ type ModbusPDUError struct {
 // The corresponding interface
 type IModbusPDUError interface {
 	IModbusPDU
-	// GetExceptionCode returns ExceptionCode
+	// GetExceptionCode returns ExceptionCode (property field)
 	GetExceptionCode() ModbusErrorCode
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
index a42b4dc..2ddf4e5 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUGetComEventCounterResponse struct {
 // The corresponding interface
 type IModbusPDUGetComEventCounterResponse interface {
 	IModbusPDU
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint16
-	// GetEventCount returns EventCount
+	// GetEventCount returns EventCount (property field)
 	GetEventCount() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
index c23e605..a8cc274 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
@@ -38,13 +38,13 @@ type ModbusPDUGetComEventLogResponse struct {
 // The corresponding interface
 type IModbusPDUGetComEventLogResponse interface {
 	IModbusPDU
-	// GetStatus returns Status
+	// GetStatus returns Status (property field)
 	GetStatus() uint16
-	// GetEventCount returns EventCount
+	// GetEventCount returns EventCount (property field)
 	GetEventCount() uint16
-	// GetMessageCount returns MessageCount
+	// GetMessageCount returns MessageCount (property field)
 	GetMessageCount() uint16
-	// GetEvents returns Events
+	// GetEvents returns Events (property field)
 	GetEvents() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
index e60f2c4..43162d0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
@@ -37,11 +37,11 @@ type ModbusPDUMaskWriteHoldingRegisterRequest struct {
 // The corresponding interface
 type IModbusPDUMaskWriteHoldingRegisterRequest interface {
 	IModbusPDU
-	// GetReferenceAddress returns ReferenceAddress
+	// GetReferenceAddress returns ReferenceAddress (property field)
 	GetReferenceAddress() uint16
-	// GetAndMask returns AndMask
+	// GetAndMask returns AndMask (property field)
 	GetAndMask() uint16
-	// GetOrMask returns OrMask
+	// GetOrMask returns OrMask (property field)
 	GetOrMask() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
index a5b7613..0d5d83d 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
@@ -37,11 +37,11 @@ type ModbusPDUMaskWriteHoldingRegisterResponse struct {
 // The corresponding interface
 type IModbusPDUMaskWriteHoldingRegisterResponse interface {
 	IModbusPDU
-	// GetReferenceAddress returns ReferenceAddress
+	// GetReferenceAddress returns ReferenceAddress (property field)
 	GetReferenceAddress() uint16
-	// GetAndMask returns AndMask
+	// GetAndMask returns AndMask (property field)
 	GetAndMask() uint16
-	// GetOrMask returns OrMask
+	// GetOrMask returns OrMask (property field)
 	GetOrMask() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
index 148b4d3..a2c53ef 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUReadCoilsRequest struct {
 // The corresponding interface
 type IModbusPDUReadCoilsRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
index 6dd3370..e2d3e99 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadCoilsResponse struct {
 // The corresponding interface
 type IModbusPDUReadCoilsResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
index 098bcd7..9b36011 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
@@ -40,9 +40,9 @@ type ModbusPDUReadDeviceIdentificationRequest struct {
 // The corresponding interface
 type IModbusPDUReadDeviceIdentificationRequest interface {
 	IModbusPDU
-	// GetLevel returns Level
+	// GetLevel returns Level (property field)
 	GetLevel() ModbusDeviceInformationLevel
-	// GetObjectId returns ObjectId
+	// GetObjectId returns ObjectId (property field)
 	GetObjectId() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
index de20c8b..9df7122 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
@@ -44,17 +44,17 @@ type ModbusPDUReadDeviceIdentificationResponse struct {
 // The corresponding interface
 type IModbusPDUReadDeviceIdentificationResponse interface {
 	IModbusPDU
-	// GetLevel returns Level
+	// GetLevel returns Level (property field)
 	GetLevel() ModbusDeviceInformationLevel
-	// GetIndividualAccess returns IndividualAccess
+	// GetIndividualAccess returns IndividualAccess (property field)
 	GetIndividualAccess() bool
-	// GetConformityLevel returns ConformityLevel
+	// GetConformityLevel returns ConformityLevel (property field)
 	GetConformityLevel() ModbusDeviceInformationConformityLevel
-	// GetMoreFollows returns MoreFollows
+	// GetMoreFollows returns MoreFollows (property field)
 	GetMoreFollows() ModbusDeviceInformationMoreFollows
-	// GetNextObjectId returns NextObjectId
+	// GetNextObjectId returns NextObjectId (property field)
 	GetNextObjectId() uint8
-	// GetObjects returns Objects
+	// GetObjects returns Objects (property field)
 	GetObjects() []*ModbusDeviceInformationObject
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
index 065df1a..9ca90dc 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUReadDiscreteInputsRequest struct {
 // The corresponding interface
 type IModbusPDUReadDiscreteInputsRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
index 547be90..c8d258e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadDiscreteInputsResponse struct {
 // The corresponding interface
 type IModbusPDUReadDiscreteInputsResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
index 62d8ce1..dd2d9c0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadExceptionStatusResponse struct {
 // The corresponding interface
 type IModbusPDUReadExceptionStatusResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
index c89c747..6dae01a 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
@@ -35,7 +35,7 @@ type ModbusPDUReadFifoQueueRequest struct {
 // The corresponding interface
 type IModbusPDUReadFifoQueueRequest interface {
 	IModbusPDU
-	// GetFifoPointerAddress returns FifoPointerAddress
+	// GetFifoPointerAddress returns FifoPointerAddress (property field)
 	GetFifoPointerAddress() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
index 1ba4e46..c10e7c0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadFifoQueueResponse struct {
 // The corresponding interface
 type IModbusPDUReadFifoQueueResponse interface {
 	IModbusPDU
-	// GetFifoValue returns FifoValue
+	// GetFifoValue returns FifoValue (property field)
 	GetFifoValue() []uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
index 29c71b5..94350b9 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
@@ -35,7 +35,7 @@ type ModbusPDUReadFileRecordRequest struct {
 // The corresponding interface
 type IModbusPDUReadFileRecordRequest interface {
 	IModbusPDU
-	// GetItems returns Items
+	// GetItems returns Items (property field)
 	GetItems() []*ModbusPDUReadFileRecordRequestItem
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
index 1565170..adc2f7e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequestItem.go
@@ -36,13 +36,13 @@ type ModbusPDUReadFileRecordRequestItem struct {
 
 // The corresponding interface
 type IModbusPDUReadFileRecordRequestItem interface {
-	// GetReferenceType returns ReferenceType
+	// GetReferenceType returns ReferenceType (property field)
 	GetReferenceType() uint8
-	// GetFileNumber returns FileNumber
+	// GetFileNumber returns FileNumber (property field)
 	GetFileNumber() uint16
-	// GetRecordNumber returns RecordNumber
+	// GetRecordNumber returns RecordNumber (property field)
 	GetRecordNumber() uint16
-	// GetRecordLength returns RecordLength
+	// GetRecordLength returns RecordLength (property field)
 	GetRecordLength() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
index 5aa572d..020740a 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadFileRecordResponse struct {
 // The corresponding interface
 type IModbusPDUReadFileRecordResponse interface {
 	IModbusPDU
-	// GetItems returns Items
+	// GetItems returns Items (property field)
 	GetItems() []*ModbusPDUReadFileRecordResponseItem
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
index cd467ea..ee3111f 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponseItem.go
@@ -34,9 +34,9 @@ type ModbusPDUReadFileRecordResponseItem struct {
 
 // The corresponding interface
 type IModbusPDUReadFileRecordResponseItem interface {
-	// GetReferenceType returns ReferenceType
+	// GetReferenceType returns ReferenceType (property field)
 	GetReferenceType() uint8
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
index 6ed4339..5e449c2 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUReadHoldingRegistersRequest struct {
 // The corresponding interface
 type IModbusPDUReadHoldingRegistersRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
index 9e1153f..1d0e822 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadHoldingRegistersResponse struct {
 // The corresponding interface
 type IModbusPDUReadHoldingRegistersResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
index 334039d..adffdd8 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUReadInputRegistersRequest struct {
 // The corresponding interface
 type IModbusPDUReadInputRegistersRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
index 6e8f4d9..15990d7 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadInputRegistersResponse struct {
 // The corresponding interface
 type IModbusPDUReadInputRegistersResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
index 46d6eb3..7cdabf6 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
@@ -39,15 +39,15 @@ type ModbusPDUReadWriteMultipleHoldingRegistersRequest struct {
 // The corresponding interface
 type IModbusPDUReadWriteMultipleHoldingRegistersRequest interface {
 	IModbusPDU
-	// GetReadStartingAddress returns ReadStartingAddress
+	// GetReadStartingAddress returns ReadStartingAddress (property field)
 	GetReadStartingAddress() uint16
-	// GetReadQuantity returns ReadQuantity
+	// GetReadQuantity returns ReadQuantity (property field)
 	GetReadQuantity() uint16
-	// GetWriteStartingAddress returns WriteStartingAddress
+	// GetWriteStartingAddress returns WriteStartingAddress (property field)
 	GetWriteStartingAddress() uint16
-	// GetWriteQuantity returns WriteQuantity
+	// GetWriteQuantity returns WriteQuantity (property field)
 	GetWriteQuantity() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
index 60d2d5d..88c8be6 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReadWriteMultipleHoldingRegistersResponse struct {
 // The corresponding interface
 type IModbusPDUReadWriteMultipleHoldingRegistersResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
index adebd2a..f53107c 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUReportServerIdResponse struct {
 // The corresponding interface
 type IModbusPDUReportServerIdResponse interface {
 	IModbusPDU
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
index e6a0f26..17a16b9 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
@@ -35,7 +35,7 @@ type ModbusPDUWriteFileRecordRequest struct {
 // The corresponding interface
 type IModbusPDUWriteFileRecordRequest interface {
 	IModbusPDU
-	// GetItems returns Items
+	// GetItems returns Items (property field)
 	GetItems() []*ModbusPDUWriteFileRecordRequestItem
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
index 7b11a10..11dd72d 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequestItem.go
@@ -36,13 +36,13 @@ type ModbusPDUWriteFileRecordRequestItem struct {
 
 // The corresponding interface
 type IModbusPDUWriteFileRecordRequestItem interface {
-	// GetReferenceType returns ReferenceType
+	// GetReferenceType returns ReferenceType (property field)
 	GetReferenceType() uint8
-	// GetFileNumber returns FileNumber
+	// GetFileNumber returns FileNumber (property field)
 	GetFileNumber() uint16
-	// GetRecordNumber returns RecordNumber
+	// GetRecordNumber returns RecordNumber (property field)
 	GetRecordNumber() uint16
-	// GetRecordData returns RecordData
+	// GetRecordData returns RecordData (property field)
 	GetRecordData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
index 7f20a72..c1b28f6 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
@@ -35,7 +35,7 @@ type ModbusPDUWriteFileRecordResponse struct {
 // The corresponding interface
 type IModbusPDUWriteFileRecordResponse interface {
 	IModbusPDU
-	// GetItems returns Items
+	// GetItems returns Items (property field)
 	GetItems() []*ModbusPDUWriteFileRecordResponseItem
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
index 608b9ce..d4f311a 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponseItem.go
@@ -36,13 +36,13 @@ type ModbusPDUWriteFileRecordResponseItem struct {
 
 // The corresponding interface
 type IModbusPDUWriteFileRecordResponseItem interface {
-	// GetReferenceType returns ReferenceType
+	// GetReferenceType returns ReferenceType (property field)
 	GetReferenceType() uint8
-	// GetFileNumber returns FileNumber
+	// GetFileNumber returns FileNumber (property field)
 	GetFileNumber() uint16
-	// GetRecordNumber returns RecordNumber
+	// GetRecordNumber returns RecordNumber (property field)
 	GetRecordNumber() uint16
-	// GetRecordData returns RecordData
+	// GetRecordData returns RecordData (property field)
 	GetRecordData() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
index dfd6938..7f1c946 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
@@ -37,11 +37,11 @@ type ModbusPDUWriteMultipleCoilsRequest struct {
 // The corresponding interface
 type IModbusPDUWriteMultipleCoilsRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
index d2e58b1..c6054ee 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteMultipleCoilsResponse struct {
 // The corresponding interface
 type IModbusPDUWriteMultipleCoilsResponse interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
index d3c35fd..6d64b3c 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
@@ -37,11 +37,11 @@ type ModbusPDUWriteMultipleHoldingRegistersRequest struct {
 // The corresponding interface
 type IModbusPDUWriteMultipleHoldingRegistersRequest interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() []byte
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
index d9488a5..49905d9 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteMultipleHoldingRegistersResponse struct {
 // The corresponding interface
 type IModbusPDUWriteMultipleHoldingRegistersResponse interface {
 	IModbusPDU
-	// GetStartingAddress returns StartingAddress
+	// GetStartingAddress returns StartingAddress (property field)
 	GetStartingAddress() uint16
-	// GetQuantity returns Quantity
+	// GetQuantity returns Quantity (property field)
 	GetQuantity() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
index 119a600..39c338f 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteSingleCoilRequest struct {
 // The corresponding interface
 type IModbusPDUWriteSingleCoilRequest interface {
 	IModbusPDU
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
index 1a76bd0..670b48c 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteSingleCoilResponse struct {
 // The corresponding interface
 type IModbusPDUWriteSingleCoilResponse interface {
 	IModbusPDU
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
index 5c4b6f6..be36c06 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteSingleRegisterRequest struct {
 // The corresponding interface
 type IModbusPDUWriteSingleRegisterRequest interface {
 	IModbusPDU
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
index c86aa8c..c4d046e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
@@ -36,9 +36,9 @@ type ModbusPDUWriteSingleRegisterResponse struct {
 // The corresponding interface
 type IModbusPDUWriteSingleRegisterResponse interface {
 	IModbusPDU
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint16
-	// GetValue returns Value
+	// GetValue returns Value (property field)
 	GetValue() uint16
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
index be3ebb1..ed2feb3 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
@@ -37,9 +37,9 @@ type ModbusSerialADU struct {
 
 // The corresponding interface
 type IModbusSerialADU interface {
-	// GetAddress returns Address
+	// GetAddress returns Address (property field)
 	GetAddress() uint8
-	// GetPdu returns Pdu
+	// GetPdu returns Pdu (property field)
 	GetPdu() *ModbusPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
index 3c3d019..eda49d6 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
@@ -42,11 +42,11 @@ type ModbusTcpADU struct {
 
 // The corresponding interface
 type IModbusTcpADU interface {
-	// GetTransactionIdentifier returns TransactionIdentifier
+	// GetTransactionIdentifier returns TransactionIdentifier (property field)
 	GetTransactionIdentifier() uint16
-	// GetUnitIdentifier returns UnitIdentifier
+	// GetUnitIdentifier returns UnitIdentifier (property field)
 	GetUnitIdentifier() uint8
-	// GetPdu returns Pdu
+	// GetPdu returns Pdu (property field)
 	GetPdu() *ModbusPDU
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go
index 16a3e4a..9dcb1b9 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckObjectPushType.go
@@ -42,17 +42,17 @@ type AlarmMessageAckObjectPushType struct {
 
 // The corresponding interface
 type IAlarmMessageAckObjectPushType interface {
-	// GetLengthSpec returns LengthSpec
+	// GetLengthSpec returns LengthSpec (property field)
 	GetLengthSpec() uint8
-	// GetSyntaxId returns SyntaxId
+	// GetSyntaxId returns SyntaxId (property field)
 	GetSyntaxId() SyntaxIdType
-	// GetNumberOfValues returns NumberOfValues
+	// GetNumberOfValues returns NumberOfValues (property field)
 	GetNumberOfValues() uint8
-	// GetEventId returns EventId
+	// GetEventId returns EventId (property field)
 	GetEventId() uint32
-	// GetAckStateGoing returns AckStateGoing
+	// GetAckStateGoing returns AckStateGoing (property field)
 	GetAckStateGoing() *State
-	// GetAckStateComing returns AckStateComing
+	// GetAckStateComing returns AckStateComing (property field)
 	GetAckStateComing() *State
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go
index 657b7b4..4ea94d7 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckPushType.go
@@ -36,13 +36,13 @@ type AlarmMessageAckPushType struct {
 
 // The corresponding interface
 type IAlarmMessageAckPushType interface {
-	// GetTimeStamp returns TimeStamp
+	// GetTimeStamp returns TimeStamp (property field)
 	GetTimeStamp() *DateAndTime
-	// GetFunctionId returns FunctionId
+	// GetFunctionId returns FunctionId (property field)
 	GetFunctionId() uint8
-	// GetNumberOfObjects returns NumberOfObjects
+	// GetNumberOfObjects returns NumberOfObjects (property field)
 	GetNumberOfObjects() uint8
-	// GetMessageObjects returns MessageObjects
+	// GetMessageObjects returns MessageObjects (property field)
 	GetMessageObjects() []*AlarmMessageAckObjectPushType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go
index 04237ae..e830bc2 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckResponseType.go
@@ -35,11 +35,11 @@ type AlarmMessageAckResponseType struct {
 
 // The corresponding interface
 type IAlarmMessageAckResponseType interface {
-	// GetFunctionId returns FunctionId
+	// GetFunctionId returns FunctionId (property field)
 	GetFunctionId() uint8
-	// GetNumberOfObjects returns NumberOfObjects
+	// GetNumberOfObjects returns NumberOfObjects (property field)
 	GetNumberOfObjects() uint8
-	// GetMessageObjects returns MessageObjects
+	// GetMessageObjects returns MessageObjects (property field)
 	GetMessageObjects() []uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go
index 401c7b0..a048a79 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageAckType.go
@@ -35,11 +35,11 @@ type AlarmMessageAckType struct {
 
 // The corresponding interface
 type IAlarmMessageAckType interface {
-	// GetFunctionId returns FunctionId
+	// GetFunctionId returns FunctionId (property field)
 	GetFunctionId() uint8
-	// GetNumberOfObjects returns NumberOfObjects
+	// GetNumberOfObjects returns NumberOfObjects (property field)
 	GetNumberOfObjects() uint8
-	// GetMessageObjects returns MessageObjects
+	// GetMessageObjects returns MessageObjects (property field)
 	GetMessageObjects() []*AlarmMessageObjectAckType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go
index b9070c0..224689c 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectAckType.go
@@ -42,15 +42,15 @@ type AlarmMessageObjectAckType struct {
 
 // The corresponding interface
 type IAlarmMessageObjectAckType interface {
-	// GetSyntaxId returns SyntaxId
+	// GetSyntaxId returns SyntaxId (property field)
 	GetSyntaxId() SyntaxIdType
-	// GetNumberOfValues returns NumberOfValues
+	// GetNumberOfValues returns NumberOfValues (property field)
 	GetNumberOfValues() uint8
-	// GetEventId returns EventId
+	// GetEventId returns EventId (property field)
 	GetEventId() uint32
-	// GetAckStateGoing returns AckStateGoing
+	// GetAckStateGoing returns AckStateGoing (property field)
 	GetAckStateGoing() *State
-	// GetAckStateComing returns AckStateComing
+	// GetAckStateComing returns AckStateComing (property field)
 	GetAckStateComing() *State
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go
index f5ecd7b..944b260 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectPushType.go
@@ -45,23 +45,23 @@ type AlarmMessageObjectPushType struct {
 
 // The corresponding interface
 type IAlarmMessageObjectPushType interface {
-	// GetLengthSpec returns LengthSpec
+	// GetLengthSpec returns LengthSpec (property field)
 	GetLengthSpec() uint8
-	// GetSyntaxId returns SyntaxId
+	// GetSyntaxId returns SyntaxId (property field)
 	GetSyntaxId() SyntaxIdType
-	// GetNumberOfValues returns NumberOfValues
+	// GetNumberOfValues returns NumberOfValues (property field)
 	GetNumberOfValues() uint8
-	// GetEventId returns EventId
+	// GetEventId returns EventId (property field)
 	GetEventId() uint32
-	// GetEventState returns EventState
+	// GetEventState returns EventState (property field)
 	GetEventState() *State
-	// GetLocalState returns LocalState
+	// GetLocalState returns LocalState (property field)
 	GetLocalState() *State
-	// GetAckStateGoing returns AckStateGoing
+	// GetAckStateGoing returns AckStateGoing (property field)
 	GetAckStateGoing() *State
-	// GetAckStateComing returns AckStateComing
+	// GetAckStateComing returns AckStateComing (property field)
 	GetAckStateComing() *State
-	// GetAssociatedValues returns AssociatedValues
+	// GetAssociatedValues returns AssociatedValues (property field)
 	GetAssociatedValues() []*AssociatedValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go
index 798b636..5df12c3 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageObjectQueryType.go
@@ -45,21 +45,21 @@ type AlarmMessageObjectQueryType struct {
 
 // The corresponding interface
 type IAlarmMessageObjectQueryType interface {
-	// GetLengthDataset returns LengthDataset
+	// GetLengthDataset returns LengthDataset (property field)
 	GetLengthDataset() uint8
-	// GetEventState returns EventState
+	// GetEventState returns EventState (property field)
 	GetEventState() *State
-	// GetAckStateGoing returns AckStateGoing
+	// GetAckStateGoing returns AckStateGoing (property field)
 	GetAckStateGoing() *State
-	// GetAckStateComing returns AckStateComing
+	// GetAckStateComing returns AckStateComing (property field)
 	GetAckStateComing() *State
-	// GetTimeComing returns TimeComing
+	// GetTimeComing returns TimeComing (property field)
 	GetTimeComing() *DateAndTime
-	// GetValueComing returns ValueComing
+	// GetValueComing returns ValueComing (property field)
 	GetValueComing() *AssociatedValueType
-	// GetTimeGoing returns TimeGoing
+	// GetTimeGoing returns TimeGoing (property field)
 	GetTimeGoing() *DateAndTime
-	// GetValueGoing returns ValueGoing
+	// GetValueGoing returns ValueGoing (property field)
 	GetValueGoing() *AssociatedValueType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go
index d2dea1a..f898867 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessagePushType.go
@@ -36,13 +36,13 @@ type AlarmMessagePushType struct {
 
 // The corresponding interface
 type IAlarmMessagePushType interface {
-	// GetTimeStamp returns TimeStamp
+	// GetTimeStamp returns TimeStamp (property field)
 	GetTimeStamp() *DateAndTime
-	// GetFunctionId returns FunctionId
+	// GetFunctionId returns FunctionId (property field)
 	GetFunctionId() uint8
-	// GetNumberOfObjects returns NumberOfObjects
+	// GetNumberOfObjects returns NumberOfObjects (property field)
 	GetNumberOfObjects() uint8
-	// GetMessageObjects returns MessageObjects
+	// GetMessageObjects returns MessageObjects (property field)
 	GetMessageObjects() []*AlarmMessageObjectPushType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go
index 1073134..b478000 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AlarmMessageQueryType.go
@@ -41,15 +41,15 @@ type AlarmMessageQueryType struct {
 
 // The corresponding interface
 type IAlarmMessageQueryType interface {
-	// GetFunctionId returns FunctionId
+	// GetFunctionId returns FunctionId (property field)
 	GetFunctionId() uint8
-	// GetNumberOfObjects returns NumberOfObjects
+	// GetNumberOfObjects returns NumberOfObjects (property field)
 	GetNumberOfObjects() uint8
-	// GetReturnCode returns ReturnCode
+	// GetReturnCode returns ReturnCode (property field)
 	GetReturnCode() DataTransportErrorCode
-	// GetTransportSize returns TransportSize
+	// GetTransportSize returns TransportSize (property field)
 	GetTransportSize() DataTransportSize
-	// GetMessageObjects returns MessageObjects
+	// GetMessageObjects returns MessageObjects (property field)
 	GetMessageObjects() []*AlarmMessageObjectQueryType
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go b/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go
index d989fc6..f440853 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/AssociatedValueType.go
@@ -36,13 +36,13 @@ type AssociatedValueType struct {
 
 // The corresponding interface
 type IAssociatedValueType interface {
-	// GetReturnCode returns ReturnCode
+	// GetReturnCode returns ReturnCode (property field)
 	GetReturnCode() DataTransportErrorCode
-	// GetTransportSize returns TransportSize
+	// GetTransportSize returns TransportSize (property field)
 	GetTransportSize() DataTransportSize
-	// GetValueLength returns ValueLength
+	// GetValueLength returns ValueLength (property field)
 	GetValueLength() uint16
-	// GetData returns Data
+	// GetData returns Data (property field)
 	GetData() []uint8
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
index d82da83..cbf396b 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
@@ -39,11 +39,11 @@ type COTPPacket struct {
 
 // The corresponding interface
 type ICOTPPacket interface {
-	// TpduCode returns TpduCode
-	TpduCode() uint8
-	// GetParameters returns Parameters
+	// GetTpduCode returns TpduCode (discriminator field)
+	GetTpduCode() uint8
+	// GetParameters returns Parameters (property field)
 	GetParameters() []*COTPParameter
-	// GetPayload returns Payload
+	// GetPayload returns Payload (property field)
 	GetPayload() *S7Message
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -251,7 +251,7 @@ func (m *COTPPacket) SerializeParent(writeBuffer utils.WriteBuffer, child ICOTPP
 	}
 
 	// Discriminator Field (tpduCode) (Used as input to a switch field)
-	tpduCode := uint8(child.TpduCode())
+	tpduCode := uint8(child.GetTpduCode())
 	_tpduCodeErr := writeBuffer.WriteUint8("tpduCode", 8, (tpduCode))
 
 	if _tpduCodeErr != nil {
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
index bc83953..7e3df93 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
@@ -40,11 +40,11 @@ type COTPPacketConnectionRequest struct {
 // The corresponding interface
 type ICOTPPacketConnectionRequest interface {
 	ICOTPPacket
-	// GetDestinationReference returns DestinationReference
+	// GetDestinationReference returns DestinationReference (property field)
 	GetDestinationReference() uint16
-	// GetSourceReference returns SourceReference
+	// GetSourceReference returns SourceReference (property field)
 	GetSourceReference() uint16
-	// GetProtocolClass returns ProtocolClass
+	// GetProtocolClass returns ProtocolClass (property field)
 	GetProtocolClass() COTPProtocolClass
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
index 2ebec1d..85ae7d8 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
@@ -40,11 +40,11 @@ type COTPPacketConnectionResponse struct {
 // The corresponding interface
 type ICOTPPacketConnectionResponse interface {
 	ICOTPPacket
-	// GetDestinationReference returns DestinationReference
+	// GetDestinationReference returns DestinationReference (property field)
 	GetDestinationReference() uint16
-	// GetSourceReference returns SourceReference
+	// GetSourceReference returns SourceReference (property field)
 	GetSourceReference() uint16
-	// GetProtocolClass returns ProtocolClass
+	// GetProtocolClass returns ProtocolClass (property field)
 	GetProtocolClass() COTPProtocolClass
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
index eeb9b69..2995fd6 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
@@ -39,9 +39,9 @@ type COTPPacketData struct {
 // The corresponding interface
 type ICOTPPacketData interface {
... 1121 lines suppressed ...