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/05/10 14:25:27 UTC

[plc4x] 02/02: feat(bacnet): introduced BACnetConfirmedServiceChoice enum

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

commit fec9e3eb0ef93460d83239cd34137660df06aafc
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue May 10 16:25:17 2022 +0200

    feat(bacnet): introduced BACnetConfirmedServiceChoice enum
    
    + clean up of BACnetConfirmedServiceRequest
---
 .../protocols/bacnet/ParserSerializerTestsuite.xml | 118 +++++--
 .../model/BACnetConfirmedServiceChoice.go          | 361 +++++++++++++++++++++
 .../model/BACnetConfirmedServiceRequest.go         | 101 +++---
 ...ACnetConfirmedServiceRequestAcknowledgeAlarm.go |   4 +-
 .../BACnetConfirmedServiceRequestAddListElement.go |   4 +-
 .../BACnetConfirmedServiceRequestAtomicReadFile.go |   4 +-
 ...BACnetConfirmedServiceRequestAtomicWriteFile.go |   4 +-
 ...> BACnetConfirmedServiceRequestAuthenticate.go} |  58 ++--
 ...firmedServiceRequestConfirmedCOVNotification.go |   4 +-
 ...rviceRequestConfirmedCOVNotificationMultiple.go |   4 +-
 ...rmedServiceRequestConfirmedEventNotification.go |   4 +-
 ...firmedServiceRequestConfirmedPrivateTransfer.go |   4 +-
 ...tConfirmedServiceRequestConfirmedTextMessage.go |   4 +-
 ...ACnetConfirmedServiceRequestConfirmedUnknown.go |   2 +-
 .../BACnetConfirmedServiceRequestCreateObject.go   |   4 +-
 .../BACnetConfirmedServiceRequestDeleteObject.go   |   4 +-
 ...rmedServiceRequestDeviceCommunicationControl.go |   4 +-
 ...tConfirmedServiceRequestGetEnrollmentSummary.go |   4 +-
 ...etConfirmedServiceRequestGetEventInformation.go |   4 +-
 ...etConfirmedServiceRequestLifeSafetyOperation.go |   4 +-
 .../BACnetConfirmedServiceRequestReadProperty.go   |   4 +-
 ...firmedServiceRequestReadPropertyConditional.go} |  58 ++--
 ...tConfirmedServiceRequestReadPropertyMultiple.go |   4 +-
 .../BACnetConfirmedServiceRequestReadRange.go      |   4 +-
 ...netConfirmedServiceRequestReinitializeDevice.go |   4 +-
 ...CnetConfirmedServiceRequestRemoveListElement.go |   4 +-
 ...ServiceRequestRemovedReadPropertyConditional.go | 153 ---------
 ...CnetConfirmedServiceRequestRemovedRequestKey.go | 153 ---------
 ... => BACnetConfirmedServiceRequestRequestKey.go} |  58 ++--
 .../BACnetConfirmedServiceRequestSubscribeCOV.go   |   4 +-
 ...tConfirmedServiceRequestSubscribeCOVProperty.go |   4 +-
 ...edServiceRequestSubscribeCOVPropertyMultiple.go |   4 +-
 .../model/BACnetConfirmedServiceRequestVTClose.go  |   4 +-
 .../model/BACnetConfirmedServiceRequestVTData.go   |   4 +-
 .../model/BACnetConfirmedServiceRequestVTOpen.go   |   4 +-
 .../BACnetConfirmedServiceRequestWriteProperty.go  |   4 +-
 ...ConfirmedServiceRequestWritePropertyMultiple.go |   4 +-
 .../resources/protocols/bacnetip/bacnetip.mspec    | 190 ++++++++---
 .../protocols/bacnet/ParserSerializerTestsuite.xml | 116 +++++--
 39 files changed, 887 insertions(+), 593 deletions(-)

diff --git a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml
index 816b0ececb..68afbb46e8 100644
--- a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml
@@ -856,7 +856,9 @@
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1120,7 +1122,9 @@ make -f demo/object/ai</value>
                     <invokeId dataType="uint" bitLength="8">2</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1378,7 +1382,9 @@ make -f awf.mak</value>
                     <invokeId dataType="uint" bitLength="8">3</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1639,7 +1645,9 @@ make -f bacstr.mak</value>
                     <invokeId dataType="uint" bitLength="8">4</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1897,7 +1905,9 @@ make -f crc.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">5</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2156,7 +2166,9 @@ make -f demo/object/lsp.</value>
                     <invokeId dataType="uint" bitLength="8">6</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2418,7 +2430,9 @@ make</value>
                     <invokeId dataType="uint" bitLength="8">7</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2681,7 +2695,9 @@ make -f tsm.mak cle</value>
                     <invokeId dataType="uint" bitLength="8">8</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -3175,7 +3191,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -3617,7 +3635,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -4054,7 +4074,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -4491,7 +4513,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -5493,7 +5517,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">15</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="WRITE_PROPERTY">15</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestWriteProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -5985,7 +6011,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6387,7 +6415,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6736,7 +6766,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6849,7 +6881,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6962,7 +6996,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7075,7 +7111,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7328,7 +7366,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">50</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7538,7 +7578,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">51</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -8146,7 +8188,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">52</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -8350,7 +8394,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">53</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -8508,7 +8554,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">54</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -8851,7 +8899,9 @@ Test "BACnet Applicat</value>
                     <invokeId dataType="uint" bitLength="8">55</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9199,7 +9249,9 @@ Test "BACnet I-Am":
                     <invokeId dataType="uint" bitLength="8">56</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9544,7 +9596,9 @@ Test "BACnet ReadProperty":
                     <invokeId dataType="uint" bitLength="8">57</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9878,7 +9932,9 @@ Test "BACnet WriteProperty":
                     <invokeId dataType="uint" bitLength="8">58</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -10091,7 +10147,7 @@ Test "BACnet Applicat</value>
               </destinationAddress>
               <sourceNetworkAddress dataType="uint" bitLength="16">13</sourceNetworkAddress>
               <sourceLength dataType="uint" bitLength="8">1</sourceLength>
-              <sourceAddress isList="true">
+              <sourceAddress isList="true">BACnetConfirmedServiceRequest
                 <value dataType="uint" bitLength="8">61</value>
               </sourceAddress>
               <apdu>
@@ -10111,7 +10167,9 @@ Test "BACnet Applicat</value>
                     <invokeId dataType="uint" bitLength="8">59</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">14</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY_MULTIPLE">14</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadPropertyMultiple>
                           <data isList="true">
                             <BACnetReadAccessSpecification>
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
new file mode 100644
index 0000000000..8568c73123
--- /dev/null
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceChoice.go
@@ -0,0 +1,361 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package model
+
+import (
+	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
+	"github.com/pkg/errors"
+)
+
+// Code generated by code-generation. DO NOT EDIT.
+
+type BACnetConfirmedServiceChoice uint8
+
+type IBACnetConfirmedServiceChoice interface {
+	Serialize(writeBuffer utils.WriteBuffer) error
+}
+
+const (
+	BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM                   BACnetConfirmedServiceChoice = 0x00
+	BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION          BACnetConfirmedServiceChoice = 0x01
+	BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE BACnetConfirmedServiceChoice = 0x1F
+	BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION        BACnetConfirmedServiceChoice = 0x02
+	BACnetConfirmedServiceChoice_GET_ALARM_SUMMARY                   BACnetConfirmedServiceChoice = 0x03
+	BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY              BACnetConfirmedServiceChoice = 0x04
+	BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION               BACnetConfirmedServiceChoice = 0x1D
+	BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION               BACnetConfirmedServiceChoice = 0x1B
+	BACnetConfirmedServiceChoice_SUBSCRIBE_COV                       BACnetConfirmedServiceChoice = 0x05
+	BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY              BACnetConfirmedServiceChoice = 0x1C
+	BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE     BACnetConfirmedServiceChoice = 0x1E
+	BACnetConfirmedServiceChoice_ATOMIC_READ_FILE                    BACnetConfirmedServiceChoice = 0x06
+	BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE                   BACnetConfirmedServiceChoice = 0x07
+	BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT                    BACnetConfirmedServiceChoice = 0x08
+	BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT                 BACnetConfirmedServiceChoice = 0x09
+	BACnetConfirmedServiceChoice_CREATE_OBJECT                       BACnetConfirmedServiceChoice = 0x0A
+	BACnetConfirmedServiceChoice_DELETE_OBJECT                       BACnetConfirmedServiceChoice = 0x0B
+	BACnetConfirmedServiceChoice_READ_PROPERTY                       BACnetConfirmedServiceChoice = 0x0C
+	BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE              BACnetConfirmedServiceChoice = 0x0E
+	BACnetConfirmedServiceChoice_READ_RANGE                          BACnetConfirmedServiceChoice = 0x1A
+	BACnetConfirmedServiceChoice_WRITE_PROPERTY                      BACnetConfirmedServiceChoice = 0x0F
+	BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE             BACnetConfirmedServiceChoice = 0x10
+	BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL        BACnetConfirmedServiceChoice = 0x11
+	BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER          BACnetConfirmedServiceChoice = 0x12
+	BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE              BACnetConfirmedServiceChoice = 0x13
+	BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE                 BACnetConfirmedServiceChoice = 0x14
+	BACnetConfirmedServiceChoice_VT_OPEN                             BACnetConfirmedServiceChoice = 0x15
+	BACnetConfirmedServiceChoice_VT_CLOSE                            BACnetConfirmedServiceChoice = 0x16
+	BACnetConfirmedServiceChoice_VT_DATA                             BACnetConfirmedServiceChoice = 0x17
+	BACnetConfirmedServiceChoice_AUTHENTICATE                        BACnetConfirmedServiceChoice = 0x18
+	BACnetConfirmedServiceChoice_REQUEST_KEY                         BACnetConfirmedServiceChoice = 0x19
+	BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL           BACnetConfirmedServiceChoice = 0x0D
+)
+
+var BACnetConfirmedServiceChoiceValues []BACnetConfirmedServiceChoice
+
+func init() {
+	_ = errors.New
+	BACnetConfirmedServiceChoiceValues = []BACnetConfirmedServiceChoice{
+		BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM,
+		BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION,
+		BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE,
+		BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION,
+		BACnetConfirmedServiceChoice_GET_ALARM_SUMMARY,
+		BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY,
+		BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION,
+		BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION,
+		BACnetConfirmedServiceChoice_SUBSCRIBE_COV,
+		BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY,
+		BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE,
+		BACnetConfirmedServiceChoice_ATOMIC_READ_FILE,
+		BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE,
+		BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT,
+		BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT,
+		BACnetConfirmedServiceChoice_CREATE_OBJECT,
+		BACnetConfirmedServiceChoice_DELETE_OBJECT,
+		BACnetConfirmedServiceChoice_READ_PROPERTY,
+		BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE,
+		BACnetConfirmedServiceChoice_READ_RANGE,
+		BACnetConfirmedServiceChoice_WRITE_PROPERTY,
+		BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE,
+		BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL,
+		BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER,
+		BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE,
+		BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE,
+		BACnetConfirmedServiceChoice_VT_OPEN,
+		BACnetConfirmedServiceChoice_VT_CLOSE,
+		BACnetConfirmedServiceChoice_VT_DATA,
+		BACnetConfirmedServiceChoice_AUTHENTICATE,
+		BACnetConfirmedServiceChoice_REQUEST_KEY,
+		BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL,
+	}
+}
+
+func BACnetConfirmedServiceChoiceByValue(value uint8) BACnetConfirmedServiceChoice {
+	switch value {
+	case 0x00:
+		return BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM
+	case 0x01:
+		return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION
+	case 0x02:
+		return BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION
+	case 0x03:
+		return BACnetConfirmedServiceChoice_GET_ALARM_SUMMARY
+	case 0x04:
+		return BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY
+	case 0x05:
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV
+	case 0x06:
+		return BACnetConfirmedServiceChoice_ATOMIC_READ_FILE
+	case 0x07:
+		return BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE
+	case 0x08:
+		return BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT
+	case 0x09:
+		return BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT
+	case 0x0A:
+		return BACnetConfirmedServiceChoice_CREATE_OBJECT
+	case 0x0B:
+		return BACnetConfirmedServiceChoice_DELETE_OBJECT
+	case 0x0C:
+		return BACnetConfirmedServiceChoice_READ_PROPERTY
+	case 0x0D:
+		return BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL
+	case 0x0E:
+		return BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE
+	case 0x0F:
+		return BACnetConfirmedServiceChoice_WRITE_PROPERTY
+	case 0x10:
+		return BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE
+	case 0x11:
+		return BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL
+	case 0x12:
+		return BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER
+	case 0x13:
+		return BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE
+	case 0x14:
+		return BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE
+	case 0x15:
+		return BACnetConfirmedServiceChoice_VT_OPEN
+	case 0x16:
+		return BACnetConfirmedServiceChoice_VT_CLOSE
+	case 0x17:
+		return BACnetConfirmedServiceChoice_VT_DATA
+	case 0x18:
+		return BACnetConfirmedServiceChoice_AUTHENTICATE
+	case 0x19:
+		return BACnetConfirmedServiceChoice_REQUEST_KEY
+	case 0x1A:
+		return BACnetConfirmedServiceChoice_READ_RANGE
+	case 0x1B:
+		return BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION
+	case 0x1C:
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY
+	case 0x1D:
+		return BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION
+	case 0x1E:
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE
+	case 0x1F:
+		return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE
+	}
+	return 0
+}
+
+func BACnetConfirmedServiceChoiceByName(value string) BACnetConfirmedServiceChoice {
+	switch value {
+	case "ACKNOWLEDGE_ALARM":
+		return BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM
+	case "CONFIRMED_COV_NOTIFICATION":
+		return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION
+	case "CONFIRMED_EVENT_NOTIFICATION":
+		return BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION
+	case "GET_ALARM_SUMMARY":
+		return BACnetConfirmedServiceChoice_GET_ALARM_SUMMARY
+	case "GET_ENROLLMENT_SUMMARY":
+		return BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY
+	case "SUBSCRIBE_COV":
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV
+	case "ATOMIC_READ_FILE":
+		return BACnetConfirmedServiceChoice_ATOMIC_READ_FILE
+	case "ATOMIC_WRITE_FILE":
+		return BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE
+	case "ADD_LIST_ELEMENT":
+		return BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT
+	case "REMOVE_LIST_ELEMENT":
+		return BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT
+	case "CREATE_OBJECT":
+		return BACnetConfirmedServiceChoice_CREATE_OBJECT
+	case "DELETE_OBJECT":
+		return BACnetConfirmedServiceChoice_DELETE_OBJECT
+	case "READ_PROPERTY":
+		return BACnetConfirmedServiceChoice_READ_PROPERTY
+	case "READ_PROPERTY_CONDITIONAL":
+		return BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL
+	case "READ_PROPERTY_MULTIPLE":
+		return BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE
+	case "WRITE_PROPERTY":
+		return BACnetConfirmedServiceChoice_WRITE_PROPERTY
+	case "WRITE_PROPERTY_MULTIPLE":
+		return BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE
+	case "DEVICE_COMMUNICATION_CONTROL":
+		return BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL
+	case "CONFIRMED_PRIVATE_TRANSFER":
+		return BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER
+	case "CONFIRMED_TEXT_MESSAGE":
+		return BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE
+	case "REINITIALIZE_DEVICE":
+		return BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE
+	case "VT_OPEN":
+		return BACnetConfirmedServiceChoice_VT_OPEN
+	case "VT_CLOSE":
+		return BACnetConfirmedServiceChoice_VT_CLOSE
+	case "VT_DATA":
+		return BACnetConfirmedServiceChoice_VT_DATA
+	case "AUTHENTICATE":
+		return BACnetConfirmedServiceChoice_AUTHENTICATE
+	case "REQUEST_KEY":
+		return BACnetConfirmedServiceChoice_REQUEST_KEY
+	case "READ_RANGE":
+		return BACnetConfirmedServiceChoice_READ_RANGE
+	case "LIFE_SAFETY_OPERATION":
+		return BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION
+	case "SUBSCRIBE_COV_PROPERTY":
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY
+	case "GET_EVENT_INFORMATION":
+		return BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION
+	case "SUBSCRIBE_COV_PROPERTY_MULTIPLE":
+		return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE
+	case "CONFIRMED_COV_NOTIFICATION_MULTIPLE":
+		return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE
+	}
+	return 0
+}
+
+func BACnetConfirmedServiceChoiceKnows(value uint8) bool {
+	for _, typeValue := range BACnetConfirmedServiceChoiceValues {
+		if uint8(typeValue) == value {
+			return true
+		}
+	}
+	return false
+}
+
+func CastBACnetConfirmedServiceChoice(structType interface{}) BACnetConfirmedServiceChoice {
+	castFunc := func(typ interface{}) BACnetConfirmedServiceChoice {
+		if sBACnetConfirmedServiceChoice, ok := typ.(BACnetConfirmedServiceChoice); ok {
+			return sBACnetConfirmedServiceChoice
+		}
+		return 0
+	}
+	return castFunc(structType)
+}
+
+func (m BACnetConfirmedServiceChoice) GetLengthInBits() uint16 {
+	return 8
+}
+
+func (m BACnetConfirmedServiceChoice) GetLengthInBytes() uint16 {
+	return m.GetLengthInBits() / 8
+}
+
+func BACnetConfirmedServiceChoiceParse(readBuffer utils.ReadBuffer) (BACnetConfirmedServiceChoice, error) {
+	val, err := readBuffer.ReadUint8("BACnetConfirmedServiceChoice", 8)
+	if err != nil {
+		return 0, nil
+	}
+	return BACnetConfirmedServiceChoiceByValue(val), nil
+}
+
+func (e BACnetConfirmedServiceChoice) Serialize(writeBuffer utils.WriteBuffer) error {
+	return writeBuffer.WriteUint8("BACnetConfirmedServiceChoice", 8, uint8(e), utils.WithAdditionalStringRepresentation(e.name()))
+}
+
+func (e BACnetConfirmedServiceChoice) name() string {
+	switch e {
+	case BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM:
+		return "ACKNOWLEDGE_ALARM"
+	case BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION:
+		return "CONFIRMED_COV_NOTIFICATION"
+	case BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION:
+		return "CONFIRMED_EVENT_NOTIFICATION"
+	case BACnetConfirmedServiceChoice_GET_ALARM_SUMMARY:
+		return "GET_ALARM_SUMMARY"
+	case BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY:
+		return "GET_ENROLLMENT_SUMMARY"
+	case BACnetConfirmedServiceChoice_SUBSCRIBE_COV:
+		return "SUBSCRIBE_COV"
+	case BACnetConfirmedServiceChoice_ATOMIC_READ_FILE:
+		return "ATOMIC_READ_FILE"
+	case BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE:
+		return "ATOMIC_WRITE_FILE"
+	case BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT:
+		return "ADD_LIST_ELEMENT"
+	case BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT:
+		return "REMOVE_LIST_ELEMENT"
+	case BACnetConfirmedServiceChoice_CREATE_OBJECT:
+		return "CREATE_OBJECT"
+	case BACnetConfirmedServiceChoice_DELETE_OBJECT:
+		return "DELETE_OBJECT"
+	case BACnetConfirmedServiceChoice_READ_PROPERTY:
+		return "READ_PROPERTY"
+	case BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL:
+		return "READ_PROPERTY_CONDITIONAL"
+	case BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE:
+		return "READ_PROPERTY_MULTIPLE"
+	case BACnetConfirmedServiceChoice_WRITE_PROPERTY:
+		return "WRITE_PROPERTY"
+	case BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE:
+		return "WRITE_PROPERTY_MULTIPLE"
+	case BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL:
+		return "DEVICE_COMMUNICATION_CONTROL"
+	case BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER:
+		return "CONFIRMED_PRIVATE_TRANSFER"
+	case BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE:
+		return "CONFIRMED_TEXT_MESSAGE"
+	case BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE:
+		return "REINITIALIZE_DEVICE"
+	case BACnetConfirmedServiceChoice_VT_OPEN:
+		return "VT_OPEN"
+	case BACnetConfirmedServiceChoice_VT_CLOSE:
+		return "VT_CLOSE"
+	case BACnetConfirmedServiceChoice_VT_DATA:
+		return "VT_DATA"
+	case BACnetConfirmedServiceChoice_AUTHENTICATE:
+		return "AUTHENTICATE"
+	case BACnetConfirmedServiceChoice_REQUEST_KEY:
+		return "REQUEST_KEY"
+	case BACnetConfirmedServiceChoice_READ_RANGE:
+		return "READ_RANGE"
+	case BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION:
+		return "LIFE_SAFETY_OPERATION"
+	case BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY:
+		return "SUBSCRIBE_COV_PROPERTY"
+	case BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION:
+		return "GET_EVENT_INFORMATION"
+	case BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE:
+		return "SUBSCRIBE_COV_PROPERTY_MULTIPLE"
+	case BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE:
+		return "CONFIRMED_COV_NOTIFICATION_MULTIPLE"
+	}
+	return ""
+}
+
+func (e BACnetConfirmedServiceChoice) String() string {
+	return e.name()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 63a2b31b1c..bb92451b01 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -37,7 +37,7 @@ type BACnetConfirmedServiceRequest struct {
 // IBACnetConfirmedServiceRequest is the corresponding interface of BACnetConfirmedServiceRequest
 type IBACnetConfirmedServiceRequest interface {
 	// GetServiceChoice returns ServiceChoice (discriminator field)
-	GetServiceChoice() uint8
+	GetServiceChoice() BACnetConfirmedServiceChoice
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
 	// GetLengthInBits returns the length in bits
@@ -110,7 +110,14 @@ func BACnetConfirmedServiceRequestParse(readBuffer utils.ReadBuffer, serviceRequ
 	_ = currentPos
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice, _serviceChoiceErr := readBuffer.ReadUint8("serviceChoice", 8)
+	if pullErr := readBuffer.PullContext("serviceChoice"); pullErr != nil {
+		return nil, pullErr
+	}
+	serviceChoice_temp, _serviceChoiceErr := BACnetConfirmedServiceChoiceParse(readBuffer)
+	var serviceChoice BACnetConfirmedServiceChoice = serviceChoice_temp
+	if closeErr := readBuffer.CloseContext("serviceChoice"); closeErr != nil {
+		return nil, closeErr
+	}
 	if _serviceChoiceErr != nil {
 		return nil, errors.Wrap(_serviceChoiceErr, "Error parsing 'serviceChoice' field")
 	}
@@ -123,68 +130,68 @@ func BACnetConfirmedServiceRequestParse(readBuffer utils.ReadBuffer, serviceRequ
 	var _child BACnetConfirmedServiceRequestChild
 	var typeSwitchError error
 	switch {
-	case serviceChoice == 0x00: // BACnetConfirmedServiceRequestAcknowledgeAlarm
+	case serviceChoice == BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM: // BACnetConfirmedServiceRequestAcknowledgeAlarm
 		_child, typeSwitchError = BACnetConfirmedServiceRequestAcknowledgeAlarmParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x01: // BACnetConfirmedServiceRequestConfirmedCOVNotification
+	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION: // BACnetConfirmedServiceRequestConfirmedCOVNotification
 		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x02: // BACnetConfirmedServiceRequestConfirmedEventNotification
+	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE: // BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION: // BACnetConfirmedServiceRequestConfirmedEventNotification
 		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedEventNotificationParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x04: // BACnetConfirmedServiceRequestGetEnrollmentSummary
+	case serviceChoice == BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY: // BACnetConfirmedServiceRequestGetEnrollmentSummary
 		_child, typeSwitchError = BACnetConfirmedServiceRequestGetEnrollmentSummaryParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x05: // BACnetConfirmedServiceRequestSubscribeCOV
+	case serviceChoice == BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION: // BACnetConfirmedServiceRequestGetEventInformation
+		_child, typeSwitchError = BACnetConfirmedServiceRequestGetEventInformationParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION: // BACnetConfirmedServiceRequestLifeSafetyOperation
+		_child, typeSwitchError = BACnetConfirmedServiceRequestLifeSafetyOperationParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_SUBSCRIBE_COV: // BACnetConfirmedServiceRequestSubscribeCOV
 		_child, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x06: // BACnetConfirmedServiceRequestAtomicReadFile
+	case serviceChoice == BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY: // BACnetConfirmedServiceRequestSubscribeCOVProperty
+		_child, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE: // BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+		_child, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_ATOMIC_READ_FILE: // BACnetConfirmedServiceRequestAtomicReadFile
 		_child, typeSwitchError = BACnetConfirmedServiceRequestAtomicReadFileParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x07: // BACnetConfirmedServiceRequestAtomicWriteFile
+	case serviceChoice == BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE: // BACnetConfirmedServiceRequestAtomicWriteFile
 		_child, typeSwitchError = BACnetConfirmedServiceRequestAtomicWriteFileParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x08: // BACnetConfirmedServiceRequestAddListElement
+	case serviceChoice == BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT: // BACnetConfirmedServiceRequestAddListElement
 		_child, typeSwitchError = BACnetConfirmedServiceRequestAddListElementParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x09: // BACnetConfirmedServiceRequestRemoveListElement
+	case serviceChoice == BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT: // BACnetConfirmedServiceRequestRemoveListElement
 		_child, typeSwitchError = BACnetConfirmedServiceRequestRemoveListElementParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0A: // BACnetConfirmedServiceRequestCreateObject
+	case serviceChoice == BACnetConfirmedServiceChoice_CREATE_OBJECT: // BACnetConfirmedServiceRequestCreateObject
 		_child, typeSwitchError = BACnetConfirmedServiceRequestCreateObjectParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0B: // BACnetConfirmedServiceRequestDeleteObject
+	case serviceChoice == BACnetConfirmedServiceChoice_DELETE_OBJECT: // BACnetConfirmedServiceRequestDeleteObject
 		_child, typeSwitchError = BACnetConfirmedServiceRequestDeleteObjectParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0C: // BACnetConfirmedServiceRequestReadProperty
+	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY: // BACnetConfirmedServiceRequestReadProperty
 		_child, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0E: // BACnetConfirmedServiceRequestReadPropertyMultiple
+	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE: // BACnetConfirmedServiceRequestReadPropertyMultiple
 		_child, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyMultipleParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0F: // BACnetConfirmedServiceRequestWriteProperty
+	case serviceChoice == BACnetConfirmedServiceChoice_READ_RANGE: // BACnetConfirmedServiceRequestReadRange
+		_child, typeSwitchError = BACnetConfirmedServiceRequestReadRangeParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_WRITE_PROPERTY: // BACnetConfirmedServiceRequestWriteProperty
 		_child, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x10: // BACnetConfirmedServiceRequestWritePropertyMultiple
+	case serviceChoice == BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE: // BACnetConfirmedServiceRequestWritePropertyMultiple
 		_child, typeSwitchError = BACnetConfirmedServiceRequestWritePropertyMultipleParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x11: // BACnetConfirmedServiceRequestDeviceCommunicationControl
+	case serviceChoice == BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL: // BACnetConfirmedServiceRequestDeviceCommunicationControl
 		_child, typeSwitchError = BACnetConfirmedServiceRequestDeviceCommunicationControlParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x12: // BACnetConfirmedServiceRequestConfirmedPrivateTransfer
+	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER: // BACnetConfirmedServiceRequestConfirmedPrivateTransfer
 		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedPrivateTransferParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x13: // BACnetConfirmedServiceRequestConfirmedTextMessage
+	case serviceChoice == BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE: // BACnetConfirmedServiceRequestConfirmedTextMessage
 		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedTextMessageParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x14: // BACnetConfirmedServiceRequestReinitializeDevice
+	case serviceChoice == BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE: // BACnetConfirmedServiceRequestReinitializeDevice
 		_child, typeSwitchError = BACnetConfirmedServiceRequestReinitializeDeviceParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x15: // BACnetConfirmedServiceRequestVTOpen
+	case serviceChoice == BACnetConfirmedServiceChoice_VT_OPEN: // BACnetConfirmedServiceRequestVTOpen
 		_child, typeSwitchError = BACnetConfirmedServiceRequestVTOpenParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x16: // BACnetConfirmedServiceRequestVTClose
+	case serviceChoice == BACnetConfirmedServiceChoice_VT_CLOSE: // BACnetConfirmedServiceRequestVTClose
 		_child, typeSwitchError = BACnetConfirmedServiceRequestVTCloseParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x17: // BACnetConfirmedServiceRequestVTData
+	case serviceChoice == BACnetConfirmedServiceChoice_VT_DATA: // BACnetConfirmedServiceRequestVTData
 		_child, typeSwitchError = BACnetConfirmedServiceRequestVTDataParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x18: // BACnetConfirmedServiceRequestRemovedAuthenticate
-		_child, typeSwitchError = BACnetConfirmedServiceRequestRemovedAuthenticateParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x19: // BACnetConfirmedServiceRequestRemovedRequestKey
-		_child, typeSwitchError = BACnetConfirmedServiceRequestRemovedRequestKeyParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x0D: // BACnetConfirmedServiceRequestRemovedReadPropertyConditional
-		_child, typeSwitchError = BACnetConfirmedServiceRequestRemovedReadPropertyConditionalParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1A: // BACnetConfirmedServiceRequestReadRange
-		_child, typeSwitchError = BACnetConfirmedServiceRequestReadRangeParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1B: // BACnetConfirmedServiceRequestLifeSafetyOperation
-		_child, typeSwitchError = BACnetConfirmedServiceRequestLifeSafetyOperationParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1C: // BACnetConfirmedServiceRequestSubscribeCOVProperty
-		_child, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1D: // BACnetConfirmedServiceRequestGetEventInformation
-		_child, typeSwitchError = BACnetConfirmedServiceRequestGetEventInformationParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1E: // BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
-		_child, typeSwitchError = BACnetConfirmedServiceRequestSubscribeCOVPropertyMultipleParse(readBuffer, serviceRequestLength)
-	case serviceChoice == 0x1F: // BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
-		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedCOVNotificationMultipleParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_AUTHENTICATE: // BACnetConfirmedServiceRequestAuthenticate
+		_child, typeSwitchError = BACnetConfirmedServiceRequestAuthenticateParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_REQUEST_KEY: // BACnetConfirmedServiceRequestRequestKey
+		_child, typeSwitchError = BACnetConfirmedServiceRequestRequestKeyParse(readBuffer, serviceRequestLength)
+	case serviceChoice == BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL: // BACnetConfirmedServiceRequestReadPropertyConditional
+		_child, typeSwitchError = BACnetConfirmedServiceRequestReadPropertyConditionalParse(readBuffer, serviceRequestLength)
 	case true: // BACnetConfirmedServiceRequestConfirmedUnknown
 		_child, typeSwitchError = BACnetConfirmedServiceRequestConfirmedUnknownParse(readBuffer, serviceRequestLength)
 	default:
@@ -214,8 +221,14 @@ func (m *BACnetConfirmedServiceRequest) SerializeParent(writeBuffer utils.WriteB
 	}
 
 	// Discriminator Field (serviceChoice) (Used as input to a switch field)
-	serviceChoice := uint8(child.GetServiceChoice())
-	_serviceChoiceErr := writeBuffer.WriteUint8("serviceChoice", 8, (serviceChoice))
+	serviceChoice := BACnetConfirmedServiceChoice(child.GetServiceChoice())
+	if pushErr := writeBuffer.PushContext("serviceChoice"); pushErr != nil {
+		return pushErr
+	}
+	_serviceChoiceErr := serviceChoice.Serialize(writeBuffer)
+	if popErr := writeBuffer.PopContext("serviceChoice"); popErr != nil {
+		return popErr
+	}
 
 	if _serviceChoiceErr != nil {
 		return errors.Wrap(_serviceChoiceErr, "Error serializing 'serviceChoice' field")
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index 446b68583f..08e211c725 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestAcknowledgeAlarm interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetServiceChoice() uint8 {
-	return 0x00
+func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_ACKNOWLEDGE_ALARM
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index c3f32c4867..e0373eb324 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -63,8 +63,8 @@ type IBACnetConfirmedServiceRequestAddListElement interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestAddListElement) GetServiceChoice() uint8 {
-	return 0x08
+func (m *BACnetConfirmedServiceRequestAddListElement) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_ADD_LIST_ELEMENT
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index ee915c866f..cedf000491 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -56,8 +56,8 @@ type IBACnetConfirmedServiceRequestAtomicReadFile interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetServiceChoice() uint8 {
-	return 0x06
+func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_ATOMIC_READ_FILE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index 82719258ba..4c60602cdf 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -66,8 +66,8 @@ type IBACnetConfirmedServiceRequestAtomicWriteFile interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetServiceChoice() uint8 {
-	return 0x07
+func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_ATOMIC_WRITE_FILE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
similarity index 62%
copy from plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
copy to plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
index 5de01232cf..ff299c46d7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAuthenticate.go
@@ -25,16 +25,16 @@ import (
 
 // Code generated by code-generation. DO NOT EDIT.
 
-// BACnetConfirmedServiceRequestCreateObject is the data-structure of this message
-type BACnetConfirmedServiceRequestCreateObject struct {
+// BACnetConfirmedServiceRequestAuthenticate is the data-structure of this message
+type BACnetConfirmedServiceRequestAuthenticate struct {
 	*BACnetConfirmedServiceRequest
 
 	// Arguments.
 	ServiceRequestLength uint16
 }
 
-// IBACnetConfirmedServiceRequestCreateObject is the corresponding interface of BACnetConfirmedServiceRequestCreateObject
-type IBACnetConfirmedServiceRequestCreateObject interface {
+// IBACnetConfirmedServiceRequestAuthenticate is the corresponding interface of BACnetConfirmedServiceRequestAuthenticate
+type IBACnetConfirmedServiceRequestAuthenticate interface {
 	IBACnetConfirmedServiceRequest
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestCreateObject interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
-	return 0x0A
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_AUTHENTICATE
 }
 
 ///////////////////////
@@ -58,82 +58,82 @@ func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
-func (m *BACnetConfirmedServiceRequestCreateObject) InitializeParent(parent *BACnetConfirmedServiceRequest) {
+func (m *BACnetConfirmedServiceRequestAuthenticate) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetParent() *BACnetConfirmedServiceRequest {
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetParent() *BACnetConfirmedServiceRequest {
 	return m.BACnetConfirmedServiceRequest
 }
 
-// NewBACnetConfirmedServiceRequestCreateObject factory function for BACnetConfirmedServiceRequestCreateObject
-func NewBACnetConfirmedServiceRequestCreateObject(serviceRequestLength uint16) *BACnetConfirmedServiceRequestCreateObject {
-	_result := &BACnetConfirmedServiceRequestCreateObject{
+// NewBACnetConfirmedServiceRequestAuthenticate factory function for BACnetConfirmedServiceRequestAuthenticate
+func NewBACnetConfirmedServiceRequestAuthenticate(serviceRequestLength uint16) *BACnetConfirmedServiceRequestAuthenticate {
+	_result := &BACnetConfirmedServiceRequestAuthenticate{
 		BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 	}
 	_result.Child = _result
 	return _result
 }
 
-func CastBACnetConfirmedServiceRequestCreateObject(structType interface{}) *BACnetConfirmedServiceRequestCreateObject {
-	if casted, ok := structType.(BACnetConfirmedServiceRequestCreateObject); ok {
+func CastBACnetConfirmedServiceRequestAuthenticate(structType interface{}) *BACnetConfirmedServiceRequestAuthenticate {
+	if casted, ok := structType.(BACnetConfirmedServiceRequestAuthenticate); ok {
 		return &casted
 	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequestCreateObject); ok {
+	if casted, ok := structType.(*BACnetConfirmedServiceRequestAuthenticate); ok {
 		return casted
 	}
 	if casted, ok := structType.(BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestCreateObject(casted.Child)
+		return CastBACnetConfirmedServiceRequestAuthenticate(casted.Child)
 	}
 	if casted, ok := structType.(*BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestCreateObject(casted.Child)
+		return CastBACnetConfirmedServiceRequestAuthenticate(casted.Child)
 	}
 	return nil
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetTypeName() string {
-	return "BACnetConfirmedServiceRequestCreateObject"
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetTypeName() string {
+	return "BACnetConfirmedServiceRequestAuthenticate"
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBits() uint16 {
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetLengthInBits() uint16 {
 	return m.GetLengthInBitsConditional(false)
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 {
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 {
 	lengthInBits := uint16(m.GetParentLengthInBits())
 
 	return lengthInBits
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBytes() uint16 {
+func (m *BACnetConfirmedServiceRequestAuthenticate) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestCreateObjectParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestCreateObject, error) {
-	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestCreateObject"); pullErr != nil {
+func BACnetConfirmedServiceRequestAuthenticateParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestAuthenticate, error) {
+	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestAuthenticate"); pullErr != nil {
 		return nil, pullErr
 	}
 	currentPos := readBuffer.GetPos()
 	_ = currentPos
 
-	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestCreateObject"); closeErr != nil {
+	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestAuthenticate"); closeErr != nil {
 		return nil, closeErr
 	}
 
 	// Create a partially initialized instance
-	_child := &BACnetConfirmedServiceRequestCreateObject{
+	_child := &BACnetConfirmedServiceRequestAuthenticate{
 		BACnetConfirmedServiceRequest: &BACnetConfirmedServiceRequest{},
 	}
 	_child.BACnetConfirmedServiceRequest.Child = _child
 	return _child, nil
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) Serialize(writeBuffer utils.WriteBuffer) error {
+func (m *BACnetConfirmedServiceRequestAuthenticate) Serialize(writeBuffer utils.WriteBuffer) error {
 	ser := func() error {
-		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestCreateObject"); pushErr != nil {
+		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestAuthenticate"); pushErr != nil {
 			return pushErr
 		}
 
-		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestCreateObject"); popErr != nil {
+		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestAuthenticate"); popErr != nil {
 			return popErr
 		}
 		return nil
@@ -141,7 +141,7 @@ func (m *BACnetConfirmedServiceRequestCreateObject) Serialize(writeBuffer utils.
 	return m.SerializeParent(writeBuffer, m, ser)
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) String() string {
+func (m *BACnetConfirmedServiceRequestAuthenticate) String() string {
 	if m == nil {
 		return "<nil>"
 	}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index c6262ba118..7b3c229d18 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -65,8 +65,8 @@ type IBACnetConfirmedServiceRequestConfirmedCOVNotification interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetServiceChoice() uint8 {
-	return 0x01
+func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index 9b8a22bba8..ff78c64a4c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetServiceChoice() uint8 {
-	return 0x1F
+func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CONFIRMED_COV_NOTIFICATION_MULTIPLE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 559b2a04e8..c0b94616f9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -90,8 +90,8 @@ type IBACnetConfirmedServiceRequestConfirmedEventNotification interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetServiceChoice() uint8 {
-	return 0x02
+func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CONFIRMED_EVENT_NOTIFICATION
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index 5c0eba1c9d..836d4a4cbe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestConfirmedPrivateTransfer interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetServiceChoice() uint8 {
-	return 0x12
+func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CONFIRMED_PRIVATE_TRANSFER
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index 6d6c123668..b9bac88ebf 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestConfirmedTextMessage interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetServiceChoice() uint8 {
-	return 0x13
+func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CONFIRMED_TEXT_MESSAGE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
index 2bc80a100b..a1a08cdc64 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
@@ -53,7 +53,7 @@ type IBACnetConfirmedServiceRequestConfirmedUnknown interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetServiceChoice() uint8 {
+func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetServiceChoice() BACnetConfirmedServiceChoice {
 	return 0
 }
 
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index 5de01232cf..4d185edf86 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestCreateObject interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
-	return 0x0A
+func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_CREATE_OBJECT
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
index daec35c6fb..df03580022 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestDeleteObject interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestDeleteObject) GetServiceChoice() uint8 {
-	return 0x0B
+func (m *BACnetConfirmedServiceRequestDeleteObject) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_DELETE_OBJECT
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index 11ee0fb1c5..ca8a6f166c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -60,8 +60,8 @@ type IBACnetConfirmedServiceRequestDeviceCommunicationControl interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetServiceChoice() uint8 {
-	return 0x11
+func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_DEVICE_COMMUNICATION_CONTROL
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index 99cf0bf42f..8c7fbacccc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestGetEnrollmentSummary interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetServiceChoice() uint8 {
-	return 0x04
+func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_GET_ENROLLMENT_SUMMARY
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index a379957c55..0fb2d81511 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestGetEventInformation interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestGetEventInformation) GetServiceChoice() uint8 {
-	return 0x1D
+func (m *BACnetConfirmedServiceRequestGetEventInformation) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_GET_EVENT_INFORMATION
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index 0000989af3..0fa60293fb 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestLifeSafetyOperation interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetServiceChoice() uint8 {
-	return 0x1B
+func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_LIFE_SAFETY_OPERATION
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index b41dea31e9..1ef6158572 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -60,8 +60,8 @@ type IBACnetConfirmedServiceRequestReadProperty interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestReadProperty) GetServiceChoice() uint8 {
-	return 0x0C
+func (m *BACnetConfirmedServiceRequestReadProperty) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_READ_PROPERTY
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
similarity index 53%
rename from plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
rename to plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
index 332a5837f2..e2c638da28 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyConditional.go
@@ -25,16 +25,16 @@ import (
 
 // Code generated by code-generation. DO NOT EDIT.
 
-// BACnetConfirmedServiceRequestRemovedAuthenticate is the data-structure of this message
-type BACnetConfirmedServiceRequestRemovedAuthenticate struct {
+// BACnetConfirmedServiceRequestReadPropertyConditional is the data-structure of this message
+type BACnetConfirmedServiceRequestReadPropertyConditional struct {
 	*BACnetConfirmedServiceRequest
 
 	// Arguments.
 	ServiceRequestLength uint16
 }
 
-// IBACnetConfirmedServiceRequestRemovedAuthenticate is the corresponding interface of BACnetConfirmedServiceRequestRemovedAuthenticate
-type IBACnetConfirmedServiceRequestRemovedAuthenticate interface {
+// IBACnetConfirmedServiceRequestReadPropertyConditional is the corresponding interface of BACnetConfirmedServiceRequestReadPropertyConditional
+type IBACnetConfirmedServiceRequestReadPropertyConditional interface {
 	IBACnetConfirmedServiceRequest
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestRemovedAuthenticate interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetServiceChoice() uint8 {
-	return 0x18
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_READ_PROPERTY_CONDITIONAL
 }
 
 ///////////////////////
@@ -58,82 +58,82 @@ func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetServiceChoice() ui
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) InitializeParent(parent *BACnetConfirmedServiceRequest) {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetParent() *BACnetConfirmedServiceRequest {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetParent() *BACnetConfirmedServiceRequest {
 	return m.BACnetConfirmedServiceRequest
 }
 
-// NewBACnetConfirmedServiceRequestRemovedAuthenticate factory function for BACnetConfirmedServiceRequestRemovedAuthenticate
-func NewBACnetConfirmedServiceRequestRemovedAuthenticate(serviceRequestLength uint16) *BACnetConfirmedServiceRequestRemovedAuthenticate {
-	_result := &BACnetConfirmedServiceRequestRemovedAuthenticate{
+// NewBACnetConfirmedServiceRequestReadPropertyConditional factory function for BACnetConfirmedServiceRequestReadPropertyConditional
+func NewBACnetConfirmedServiceRequestReadPropertyConditional(serviceRequestLength uint16) *BACnetConfirmedServiceRequestReadPropertyConditional {
+	_result := &BACnetConfirmedServiceRequestReadPropertyConditional{
 		BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 	}
 	_result.Child = _result
 	return _result
 }
 
-func CastBACnetConfirmedServiceRequestRemovedAuthenticate(structType interface{}) *BACnetConfirmedServiceRequestRemovedAuthenticate {
-	if casted, ok := structType.(BACnetConfirmedServiceRequestRemovedAuthenticate); ok {
+func CastBACnetConfirmedServiceRequestReadPropertyConditional(structType interface{}) *BACnetConfirmedServiceRequestReadPropertyConditional {
+	if casted, ok := structType.(BACnetConfirmedServiceRequestReadPropertyConditional); ok {
 		return &casted
 	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequestRemovedAuthenticate); ok {
+	if casted, ok := structType.(*BACnetConfirmedServiceRequestReadPropertyConditional); ok {
 		return casted
 	}
 	if casted, ok := structType.(BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedAuthenticate(casted.Child)
+		return CastBACnetConfirmedServiceRequestReadPropertyConditional(casted.Child)
 	}
 	if casted, ok := structType.(*BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedAuthenticate(casted.Child)
+		return CastBACnetConfirmedServiceRequestReadPropertyConditional(casted.Child)
 	}
 	return nil
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetTypeName() string {
-	return "BACnetConfirmedServiceRequestRemovedAuthenticate"
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetTypeName() string {
+	return "BACnetConfirmedServiceRequestReadPropertyConditional"
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBits() uint16 {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetLengthInBits() uint16 {
 	return m.GetLengthInBitsConditional(false)
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBitsConditional(lastItem bool) uint16 {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 {
 	lengthInBits := uint16(m.GetParentLengthInBits())
 
 	return lengthInBits
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetLengthInBytes() uint16 {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestRemovedAuthenticateParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestRemovedAuthenticate, error) {
-	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestRemovedAuthenticate"); pullErr != nil {
+func BACnetConfirmedServiceRequestReadPropertyConditionalParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestReadPropertyConditional, error) {
+	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestReadPropertyConditional"); pullErr != nil {
 		return nil, pullErr
 	}
 	currentPos := readBuffer.GetPos()
 	_ = currentPos
 
-	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestRemovedAuthenticate"); closeErr != nil {
+	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestReadPropertyConditional"); closeErr != nil {
 		return nil, closeErr
 	}
 
 	// Create a partially initialized instance
-	_child := &BACnetConfirmedServiceRequestRemovedAuthenticate{
+	_child := &BACnetConfirmedServiceRequestReadPropertyConditional{
 		BACnetConfirmedServiceRequest: &BACnetConfirmedServiceRequest{},
 	}
 	_child.BACnetConfirmedServiceRequest.Child = _child
 	return _child, nil
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) Serialize(writeBuffer utils.WriteBuffer) error {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) Serialize(writeBuffer utils.WriteBuffer) error {
 	ser := func() error {
-		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestRemovedAuthenticate"); pushErr != nil {
+		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestReadPropertyConditional"); pushErr != nil {
 			return pushErr
 		}
 
-		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestRemovedAuthenticate"); popErr != nil {
+		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestReadPropertyConditional"); popErr != nil {
 			return popErr
 		}
 		return nil
@@ -141,7 +141,7 @@ func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) Serialize(writeBuffer
 	return m.SerializeParent(writeBuffer, m, ser)
 }
 
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) String() string {
+func (m *BACnetConfirmedServiceRequestReadPropertyConditional) String() string {
 	if m == nil {
 		return "<nil>"
 	}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index 1042b46c66..4d09fad296 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -53,8 +53,8 @@ type IBACnetConfirmedServiceRequestReadPropertyMultiple interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetServiceChoice() uint8 {
-	return 0x0E
+func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_READ_PROPERTY_MULTIPLE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index 32f9240dc6..b32b2597fd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestReadRange interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestReadRange) GetServiceChoice() uint8 {
-	return 0x1A
+func (m *BACnetConfirmedServiceRequestReadRange) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_READ_RANGE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index f9b6569af0..eaa6851dc4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -57,8 +57,8 @@ type IBACnetConfirmedServiceRequestReinitializeDevice interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetServiceChoice() uint8 {
-	return 0x14
+func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_REINITIALIZE_DEVICE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index e86201220a..65c460a45c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -63,8 +63,8 @@ type IBACnetConfirmedServiceRequestRemoveListElement interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestRemoveListElement) GetServiceChoice() uint8 {
-	return 0x09
+func (m *BACnetConfirmedServiceRequestRemoveListElement) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_REMOVE_LIST_ELEMENT
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
deleted file mode 100644
index 593089e515..0000000000
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package model
-
-import (
-	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
-)
-
-// Code generated by code-generation. DO NOT EDIT.
-
-// BACnetConfirmedServiceRequestRemovedReadPropertyConditional is the data-structure of this message
-type BACnetConfirmedServiceRequestRemovedReadPropertyConditional struct {
-	*BACnetConfirmedServiceRequest
-
-	// Arguments.
-	ServiceRequestLength uint16
-}
-
-// IBACnetConfirmedServiceRequestRemovedReadPropertyConditional is the corresponding interface of BACnetConfirmedServiceRequestRemovedReadPropertyConditional
-type IBACnetConfirmedServiceRequestRemovedReadPropertyConditional interface {
-	IBACnetConfirmedServiceRequest
-	// GetLengthInBytes returns the length in bytes
-	GetLengthInBytes() uint16
-	// GetLengthInBits returns the length in bits
-	GetLengthInBits() uint16
-	// Serialize serializes this type
-	Serialize(writeBuffer utils.WriteBuffer) error
-}
-
-///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////
-/////////////////////// Accessors for discriminator values.
-///////////////////////
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetServiceChoice() uint8 {
-	return 0x0D
-}
-
-///////////////////////
-///////////////////////
-///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) InitializeParent(parent *BACnetConfirmedServiceRequest) {
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetParent() *BACnetConfirmedServiceRequest {
-	return m.BACnetConfirmedServiceRequest
-}
-
-// NewBACnetConfirmedServiceRequestRemovedReadPropertyConditional factory function for BACnetConfirmedServiceRequestRemovedReadPropertyConditional
-func NewBACnetConfirmedServiceRequestRemovedReadPropertyConditional(serviceRequestLength uint16) *BACnetConfirmedServiceRequestRemovedReadPropertyConditional {
-	_result := &BACnetConfirmedServiceRequestRemovedReadPropertyConditional{
-		BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
-	}
-	_result.Child = _result
-	return _result
-}
-
-func CastBACnetConfirmedServiceRequestRemovedReadPropertyConditional(structType interface{}) *BACnetConfirmedServiceRequestRemovedReadPropertyConditional {
-	if casted, ok := structType.(BACnetConfirmedServiceRequestRemovedReadPropertyConditional); ok {
-		return &casted
-	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequestRemovedReadPropertyConditional); ok {
-		return casted
-	}
-	if casted, ok := structType.(BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedReadPropertyConditional(casted.Child)
-	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedReadPropertyConditional(casted.Child)
-	}
-	return nil
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetTypeName() string {
-	return "BACnetConfirmedServiceRequestRemovedReadPropertyConditional"
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBits() uint16 {
-	return m.GetLengthInBitsConditional(false)
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBitsConditional(lastItem bool) uint16 {
-	lengthInBits := uint16(m.GetParentLengthInBits())
-
-	return lengthInBits
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetLengthInBytes() uint16 {
-	return m.GetLengthInBits() / 8
-}
-
-func BACnetConfirmedServiceRequestRemovedReadPropertyConditionalParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestRemovedReadPropertyConditional, error) {
-	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestRemovedReadPropertyConditional"); pullErr != nil {
-		return nil, pullErr
-	}
-	currentPos := readBuffer.GetPos()
-	_ = currentPos
-
-	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestRemovedReadPropertyConditional"); closeErr != nil {
-		return nil, closeErr
-	}
-
-	// Create a partially initialized instance
-	_child := &BACnetConfirmedServiceRequestRemovedReadPropertyConditional{
-		BACnetConfirmedServiceRequest: &BACnetConfirmedServiceRequest{},
-	}
-	_child.BACnetConfirmedServiceRequest.Child = _child
-	return _child, nil
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) Serialize(writeBuffer utils.WriteBuffer) error {
-	ser := func() error {
-		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestRemovedReadPropertyConditional"); pushErr != nil {
-			return pushErr
-		}
-
-		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestRemovedReadPropertyConditional"); popErr != nil {
-			return popErr
-		}
-		return nil
-	}
-	return m.SerializeParent(writeBuffer, m, ser)
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) String() string {
-	if m == nil {
-		return "<nil>"
-	}
-	buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
-	if err := m.Serialize(buffer); err != nil {
-		return err.Error()
-	}
-	return buffer.GetBox().String()
-}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
deleted file mode 100644
index 3f5e826f0f..0000000000
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package model
-
-import (
-	"github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
-)
-
-// Code generated by code-generation. DO NOT EDIT.
-
-// BACnetConfirmedServiceRequestRemovedRequestKey is the data-structure of this message
-type BACnetConfirmedServiceRequestRemovedRequestKey struct {
-	*BACnetConfirmedServiceRequest
-
-	// Arguments.
-	ServiceRequestLength uint16
-}
-
-// IBACnetConfirmedServiceRequestRemovedRequestKey is the corresponding interface of BACnetConfirmedServiceRequestRemovedRequestKey
-type IBACnetConfirmedServiceRequestRemovedRequestKey interface {
-	IBACnetConfirmedServiceRequest
-	// GetLengthInBytes returns the length in bytes
-	GetLengthInBytes() uint16
-	// GetLengthInBits returns the length in bits
-	GetLengthInBits() uint16
-	// Serialize serializes this type
-	Serialize(writeBuffer utils.WriteBuffer) error
-}
-
-///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////
-/////////////////////// Accessors for discriminator values.
-///////////////////////
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetServiceChoice() uint8 {
-	return 0x19
-}
-
-///////////////////////
-///////////////////////
-///////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) InitializeParent(parent *BACnetConfirmedServiceRequest) {
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetParent() *BACnetConfirmedServiceRequest {
-	return m.BACnetConfirmedServiceRequest
-}
-
-// NewBACnetConfirmedServiceRequestRemovedRequestKey factory function for BACnetConfirmedServiceRequestRemovedRequestKey
-func NewBACnetConfirmedServiceRequestRemovedRequestKey(serviceRequestLength uint16) *BACnetConfirmedServiceRequestRemovedRequestKey {
-	_result := &BACnetConfirmedServiceRequestRemovedRequestKey{
-		BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
-	}
-	_result.Child = _result
-	return _result
-}
-
-func CastBACnetConfirmedServiceRequestRemovedRequestKey(structType interface{}) *BACnetConfirmedServiceRequestRemovedRequestKey {
-	if casted, ok := structType.(BACnetConfirmedServiceRequestRemovedRequestKey); ok {
-		return &casted
-	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequestRemovedRequestKey); ok {
-		return casted
-	}
-	if casted, ok := structType.(BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedRequestKey(casted.Child)
-	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestRemovedRequestKey(casted.Child)
-	}
-	return nil
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetTypeName() string {
-	return "BACnetConfirmedServiceRequestRemovedRequestKey"
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBits() uint16 {
-	return m.GetLengthInBitsConditional(false)
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBitsConditional(lastItem bool) uint16 {
-	lengthInBits := uint16(m.GetParentLengthInBits())
-
-	return lengthInBits
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetLengthInBytes() uint16 {
-	return m.GetLengthInBits() / 8
-}
-
-func BACnetConfirmedServiceRequestRemovedRequestKeyParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestRemovedRequestKey, error) {
-	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestRemovedRequestKey"); pullErr != nil {
-		return nil, pullErr
-	}
-	currentPos := readBuffer.GetPos()
-	_ = currentPos
-
-	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestRemovedRequestKey"); closeErr != nil {
-		return nil, closeErr
-	}
-
-	// Create a partially initialized instance
-	_child := &BACnetConfirmedServiceRequestRemovedRequestKey{
-		BACnetConfirmedServiceRequest: &BACnetConfirmedServiceRequest{},
-	}
-	_child.BACnetConfirmedServiceRequest.Child = _child
-	return _child, nil
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) Serialize(writeBuffer utils.WriteBuffer) error {
-	ser := func() error {
-		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestRemovedRequestKey"); pushErr != nil {
-			return pushErr
-		}
-
-		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestRemovedRequestKey"); popErr != nil {
-			return popErr
-		}
-		return nil
-	}
-	return m.SerializeParent(writeBuffer, m, ser)
-}
-
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) String() string {
-	if m == nil {
-		return "<nil>"
-	}
-	buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
-	if err := m.Serialize(buffer); err != nil {
-		return err.Error()
-	}
-	return buffer.GetBox().String()
-}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
similarity index 58%
copy from plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
copy to plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
index 5de01232cf..ed8505288e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRequestKey.go
@@ -25,16 +25,16 @@ import (
 
 // Code generated by code-generation. DO NOT EDIT.
 
-// BACnetConfirmedServiceRequestCreateObject is the data-structure of this message
-type BACnetConfirmedServiceRequestCreateObject struct {
+// BACnetConfirmedServiceRequestRequestKey is the data-structure of this message
+type BACnetConfirmedServiceRequestRequestKey struct {
 	*BACnetConfirmedServiceRequest
 
 	// Arguments.
 	ServiceRequestLength uint16
 }
 
-// IBACnetConfirmedServiceRequestCreateObject is the corresponding interface of BACnetConfirmedServiceRequestCreateObject
-type IBACnetConfirmedServiceRequestCreateObject interface {
+// IBACnetConfirmedServiceRequestRequestKey is the corresponding interface of BACnetConfirmedServiceRequestRequestKey
+type IBACnetConfirmedServiceRequestRequestKey interface {
 	IBACnetConfirmedServiceRequest
 	// GetLengthInBytes returns the length in bytes
 	GetLengthInBytes() uint16
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestCreateObject interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
-	return 0x0A
+func (m *BACnetConfirmedServiceRequestRequestKey) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_REQUEST_KEY
 }
 
 ///////////////////////
@@ -58,82 +58,82 @@ func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
 ///////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 
-func (m *BACnetConfirmedServiceRequestCreateObject) InitializeParent(parent *BACnetConfirmedServiceRequest) {
+func (m *BACnetConfirmedServiceRequestRequestKey) InitializeParent(parent *BACnetConfirmedServiceRequest) {
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetParent() *BACnetConfirmedServiceRequest {
+func (m *BACnetConfirmedServiceRequestRequestKey) GetParent() *BACnetConfirmedServiceRequest {
 	return m.BACnetConfirmedServiceRequest
 }
 
-// NewBACnetConfirmedServiceRequestCreateObject factory function for BACnetConfirmedServiceRequestCreateObject
-func NewBACnetConfirmedServiceRequestCreateObject(serviceRequestLength uint16) *BACnetConfirmedServiceRequestCreateObject {
-	_result := &BACnetConfirmedServiceRequestCreateObject{
+// NewBACnetConfirmedServiceRequestRequestKey factory function for BACnetConfirmedServiceRequestRequestKey
+func NewBACnetConfirmedServiceRequestRequestKey(serviceRequestLength uint16) *BACnetConfirmedServiceRequestRequestKey {
+	_result := &BACnetConfirmedServiceRequestRequestKey{
 		BACnetConfirmedServiceRequest: NewBACnetConfirmedServiceRequest(serviceRequestLength),
 	}
 	_result.Child = _result
 	return _result
 }
 
-func CastBACnetConfirmedServiceRequestCreateObject(structType interface{}) *BACnetConfirmedServiceRequestCreateObject {
-	if casted, ok := structType.(BACnetConfirmedServiceRequestCreateObject); ok {
+func CastBACnetConfirmedServiceRequestRequestKey(structType interface{}) *BACnetConfirmedServiceRequestRequestKey {
+	if casted, ok := structType.(BACnetConfirmedServiceRequestRequestKey); ok {
 		return &casted
 	}
-	if casted, ok := structType.(*BACnetConfirmedServiceRequestCreateObject); ok {
+	if casted, ok := structType.(*BACnetConfirmedServiceRequestRequestKey); ok {
 		return casted
 	}
 	if casted, ok := structType.(BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestCreateObject(casted.Child)
+		return CastBACnetConfirmedServiceRequestRequestKey(casted.Child)
 	}
 	if casted, ok := structType.(*BACnetConfirmedServiceRequest); ok {
-		return CastBACnetConfirmedServiceRequestCreateObject(casted.Child)
+		return CastBACnetConfirmedServiceRequestRequestKey(casted.Child)
 	}
 	return nil
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetTypeName() string {
-	return "BACnetConfirmedServiceRequestCreateObject"
+func (m *BACnetConfirmedServiceRequestRequestKey) GetTypeName() string {
+	return "BACnetConfirmedServiceRequestRequestKey"
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBits() uint16 {
+func (m *BACnetConfirmedServiceRequestRequestKey) GetLengthInBits() uint16 {
 	return m.GetLengthInBitsConditional(false)
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBitsConditional(lastItem bool) uint16 {
+func (m *BACnetConfirmedServiceRequestRequestKey) GetLengthInBitsConditional(lastItem bool) uint16 {
 	lengthInBits := uint16(m.GetParentLengthInBits())
 
 	return lengthInBits
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) GetLengthInBytes() uint16 {
+func (m *BACnetConfirmedServiceRequestRequestKey) GetLengthInBytes() uint16 {
 	return m.GetLengthInBits() / 8
 }
 
-func BACnetConfirmedServiceRequestCreateObjectParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestCreateObject, error) {
-	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestCreateObject"); pullErr != nil {
+func BACnetConfirmedServiceRequestRequestKeyParse(readBuffer utils.ReadBuffer, serviceRequestLength uint16) (*BACnetConfirmedServiceRequestRequestKey, error) {
+	if pullErr := readBuffer.PullContext("BACnetConfirmedServiceRequestRequestKey"); pullErr != nil {
 		return nil, pullErr
 	}
 	currentPos := readBuffer.GetPos()
 	_ = currentPos
 
-	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestCreateObject"); closeErr != nil {
+	if closeErr := readBuffer.CloseContext("BACnetConfirmedServiceRequestRequestKey"); closeErr != nil {
 		return nil, closeErr
 	}
 
 	// Create a partially initialized instance
-	_child := &BACnetConfirmedServiceRequestCreateObject{
+	_child := &BACnetConfirmedServiceRequestRequestKey{
 		BACnetConfirmedServiceRequest: &BACnetConfirmedServiceRequest{},
 	}
 	_child.BACnetConfirmedServiceRequest.Child = _child
 	return _child, nil
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) Serialize(writeBuffer utils.WriteBuffer) error {
+func (m *BACnetConfirmedServiceRequestRequestKey) Serialize(writeBuffer utils.WriteBuffer) error {
 	ser := func() error {
-		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestCreateObject"); pushErr != nil {
+		if pushErr := writeBuffer.PushContext("BACnetConfirmedServiceRequestRequestKey"); pushErr != nil {
 			return pushErr
 		}
 
-		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestCreateObject"); popErr != nil {
+		if popErr := writeBuffer.PopContext("BACnetConfirmedServiceRequestRequestKey"); popErr != nil {
 			return popErr
 		}
 		return nil
@@ -141,7 +141,7 @@ func (m *BACnetConfirmedServiceRequestCreateObject) Serialize(writeBuffer utils.
 	return m.SerializeParent(writeBuffer, m, ser)
 }
 
-func (m *BACnetConfirmedServiceRequestCreateObject) String() string {
+func (m *BACnetConfirmedServiceRequestRequestKey) String() string {
 	if m == nil {
 		return "<nil>"
 	}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index 7caf065381..08885c9a49 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -62,8 +62,8 @@ type IBACnetConfirmedServiceRequestSubscribeCOV interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetServiceChoice() uint8 {
-	return 0x05
+func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_SUBSCRIBE_COV
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index 6a1cf8b95e..32640eb47e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestSubscribeCOVProperty interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetServiceChoice() uint8 {
-	return 0x1C
+func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index dd114b967b..20b478b6a8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetServiceChoice() uint8 {
-	return 0x1E
+func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_SUBSCRIBE_COV_PROPERTY_MULTIPLE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index 5784f43492..43975424ca 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestVTClose interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestVTClose) GetServiceChoice() uint8 {
-	return 0x16
+func (m *BACnetConfirmedServiceRequestVTClose) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_VT_CLOSE
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
index b6058c15c6..e601a83539 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestVTData interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestVTData) GetServiceChoice() uint8 {
-	return 0x17
+func (m *BACnetConfirmedServiceRequestVTData) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_VT_DATA
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
index 3539aaf6ba..4969b4a9ff 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
@@ -49,8 +49,8 @@ type IBACnetConfirmedServiceRequestVTOpen interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestVTOpen) GetServiceChoice() uint8 {
-	return 0x15
+func (m *BACnetConfirmedServiceRequestVTOpen) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_VT_OPEN
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 2519fbe1be..e8a20cf8ca 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -66,8 +66,8 @@ type IBACnetConfirmedServiceRequestWriteProperty interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestWriteProperty) GetServiceChoice() uint8 {
-	return 0x0F
+func (m *BACnetConfirmedServiceRequestWriteProperty) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_WRITE_PROPERTY
 }
 
 ///////////////////////
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index 9c59f2c252..c6271253c3 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -53,8 +53,8 @@ type IBACnetConfirmedServiceRequestWritePropertyMultiple interface {
 /////////////////////// Accessors for discriminator values.
 ///////////////////////
 
-func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetServiceChoice() uint8 {
-	return 0x10
+func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetServiceChoice() BACnetConfirmedServiceChoice {
+	return BACnetConfirmedServiceChoice_WRITE_PROPERTY_MULTIPLE
 }
 
 ///////////////////////
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index 805fc70eae..54fc330a62 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -301,18 +301,25 @@
 ]
 
 [discriminatedType BACnetConfirmedServiceRequest(uint 16 serviceRequestLength)
-    [discriminator uint 8 serviceChoice]
+    [discriminator BACnetConfirmedServiceChoice serviceChoice]
     [typeSwitch serviceChoice
-        ['0x00' BACnetConfirmedServiceRequestAcknowledgeAlarm
+        ////
+        // Alarm and Event Services
+
+        ['ACKNOWLEDGE_ALARM' BACnetConfirmedServiceRequestAcknowledgeAlarm
+            // TODO: implement me
         ]
-        ['0x01' BACnetConfirmedServiceRequestConfirmedCOVNotification
+        ['CONFIRMED_COV_NOTIFICATION' BACnetConfirmedServiceRequestConfirmedCOVNotification
             [simple   BACnetContextTagUnsignedInteger('0', 'BACnetDataType.UNSIGNED_INTEGER')          subscriberProcessIdentifier ]
             [simple   BACnetContextTagObjectIdentifier('1', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER') initiatingDeviceIdentifier   ]
             [simple   BACnetContextTagObjectIdentifier('2', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER') monitoredObjectIdentifier   ]
             [simple   BACnetContextTagUnsignedInteger('3', 'BACnetDataType.UNSIGNED_INTEGER')          lifetimeInSeconds           ]
             [simple   BACnetPropertyValues('4', 'monitoredObjectIdentifier.objectType')                listOfValues                ]
         ]
-        ['0x02' BACnetConfirmedServiceRequestConfirmedEventNotification // Spec complete
+        ['CONFIRMED_COV_NOTIFICATION_MULTIPLE' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+            // TODO: implement me
+        ]
+        ['CONFIRMED_EVENT_NOTIFICATION' BACnetConfirmedServiceRequestConfirmedEventNotification // Spec complete
             [simple   BACnetContextTagUnsignedInteger('0', 'BACnetDataType.UNSIGNED_INTEGER')          processIdentifier            ]
             [simple   BACnetContextTagObjectIdentifier('1', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER') initiatingDeviceIdentifier   ]
             [simple   BACnetContextTagObjectIdentifier('2', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER') eventObjectIdentifier        ]
@@ -327,45 +334,68 @@
             [simple   BACnetContextTagEventState('11', 'BACnetDataType.EVENT_STATE')                   toState                      ]
             [optional BACnetNotificationParameters('12', 'eventObjectIdentifier.objectType')           eventValues                  ]
         ]
-
-        ['0x04' BACnetConfirmedServiceRequestGetEnrollmentSummary
+        ['GET_ENROLLMENT_SUMMARY' BACnetConfirmedServiceRequestGetEnrollmentSummary
+            // TODO: implement me
+        ]
+        ['GET_EVENT_INFORMATION' BACnetConfirmedServiceRequestGetEventInformation
+            // TODO: implement me
         ]
-        ['0x05' BACnetConfirmedServiceRequestSubscribeCOV
+        ['LIFE_SAFETY_OPERATION' BACnetConfirmedServiceRequestLifeSafetyOperation
+            // TODO: implement me
+        ]
+        ['SUBSCRIBE_COV' BACnetConfirmedServiceRequestSubscribeCOV
             [simple BACnetContextTagUnsignedInteger('0', 'BACnetDataType.UNSIGNED_INTEGER')          subscriberProcessIdentifier ]
             [simple BACnetContextTagObjectIdentifier('1', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER') monitoredObjectIdentifier   ]
             [simple BACnetContextTagBoolean('2', 'BACnetDataType.BOOLEAN')                           issueConfirmed              ]
             [simple BACnetContextTagUnsignedInteger('3', 'BACnetDataType.UNSIGNED_INTEGER')          lifetimeInSeconds           ]
         ]
+        ['SUBSCRIBE_COV_PROPERTY' BACnetConfirmedServiceRequestSubscribeCOVProperty
+            // TODO: implement me
+        ]
+        ['SUBSCRIBE_COV_PROPERTY_MULTIPLE' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+            // TODO: implement me
+        ]
+        //
+        ////
+
+        ////
+        // File Access Services
 
-        ['0x06' BACnetConfirmedServiceRequestAtomicReadFile
+        ['ATOMIC_READ_FILE' BACnetConfirmedServiceRequestAtomicReadFile
             [simple BACnetApplicationTagObjectIdentifier                        fileIdentifier      ]
             [simple BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord   accessMethod        ]
         ]
-        ['0x07' BACnetConfirmedServiceRequestAtomicWriteFile
+        ['ATOMIC_WRITE_FILE' BACnetConfirmedServiceRequestAtomicWriteFile
             [simple BACnetApplicationTagObjectIdentifier                  deviceIdentifier    ]
             [optional BACnetOpeningTag('0', 'BACnetDataType.OPENING_TAG') openingTag          ]
             [simple BACnetApplicationTagSignedInteger                     fileStartPosition   ]
             [simple BACnetApplicationTagOctetString                       fileData            ]
             [optional BACnetClosingTag('0', 'BACnetDataType.CLOSING_TAG') closingTag          ]
         ]
+        //
+        ////
 
-        ['0x08' BACnetConfirmedServiceRequestAddListElement
+        ////
+        // Object Access Services
+        ['ADD_LIST_ELEMENT' BACnetConfirmedServiceRequestAddListElement
             [simple   BACnetContextTagObjectIdentifier('0', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER')     objectIdentifier    ]
             [simple   BACnetContextTagPropertyIdentifier('1', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER') propertyIdentifier  ]
             [optional BACnetContextTagUnsignedInteger('2', 'BACnetDataType.UNSIGNED_INTEGER')              arrayIndex          ]
             [optional BACnetConstructedData('3', 'objectIdentifier.objectType', 'propertyIdentifier')      listOfElements      ]
         ]
-        ['0x09' BACnetConfirmedServiceRequestRemoveListElement
+        ['REMOVE_LIST_ELEMENT' BACnetConfirmedServiceRequestRemoveListElement
             [simple   BACnetContextTagObjectIdentifier('0', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER')     objectIdentifier    ]
             [simple   BACnetContextTagPropertyIdentifier('1', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER') propertyIdentifier  ]
             [optional BACnetContextTagUnsignedInteger('2', 'BACnetDataType.UNSIGNED_INTEGER')              arrayIndex          ]
             [optional BACnetConstructedData('3', 'objectIdentifier.objectType', 'propertyIdentifier')      listOfElements      ]
         ]
-        ['0x0A' BACnetConfirmedServiceRequestCreateObject
+        ['CREATE_OBJECT' BACnetConfirmedServiceRequestCreateObject
+            // TODO: implement me
         ]
-        ['0x0B' BACnetConfirmedServiceRequestDeleteObject
+        ['DELETE_OBJECT' BACnetConfirmedServiceRequestDeleteObject
+            // TODO: implement me
         ]
-        ['0x0C' BACnetConfirmedServiceRequestReadProperty
+        ['READ_PROPERTY' BACnetConfirmedServiceRequestReadProperty
             [simple   BACnetContextTagObjectIdentifier('0', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER')
                             objectIdentifier        ]
             [simple   BACnetContextTagPropertyIdentifier('1', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER')
@@ -373,75 +403,155 @@
             [optional BACnetContextTagUnsignedInteger('2', 'BACnetDataType.UNSIGNED_INTEGER')
                             arrayIndex              ]
         ]
-        ['0x0E' BACnetConfirmedServiceRequestReadPropertyMultiple
+        ['READ_PROPERTY_MULTIPLE' BACnetConfirmedServiceRequestReadPropertyMultiple
             [array    BACnetReadAccessSpecification
                             data
                             length
                             'serviceRequestLength'                   ]
         ]
-        ['0x0F' BACnetConfirmedServiceRequestWriteProperty
+        ['READ_RANGE' BACnetConfirmedServiceRequestReadRange
+            // TODO: implement me
+        ]
+        ['WRITE_PROPERTY' BACnetConfirmedServiceRequestWriteProperty
             [simple   BACnetContextTagObjectIdentifier('0', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER')     objectIdentifier    ]
             [simple   BACnetContextTagPropertyIdentifier('1', 'BACnetDataType.BACNET_PROPERTY_IDENTIFIER') propertyIdentifier  ]
             [optional BACnetContextTagUnsignedInteger('2', 'BACnetDataType.UNSIGNED_INTEGER')              arrayIndex          ]
             [simple   BACnetConstructedData('3', 'objectIdentifier.objectType', 'propertyIdentifier')      propertyValue       ]
             [optional BACnetContextTagUnsignedInteger('4', 'BACnetDataType.UNSIGNED_INTEGER')              priority            ]
         ]
-        ['0x10' BACnetConfirmedServiceRequestWritePropertyMultiple
+        ['WRITE_PROPERTY_MULTIPLE' BACnetConfirmedServiceRequestWritePropertyMultiple
             [array    BACnetWriteAccessSpecification
                             data
                             length
                             'serviceRequestLength'                   ]
         ]
+        //
+        ////
+
+        ////
+        // Remote Device Management Services
 
-        ['0x11' BACnetConfirmedServiceRequestDeviceCommunicationControl
+        ['DEVICE_COMMUNICATION_CONTROL' BACnetConfirmedServiceRequestDeviceCommunicationControl
             [optional BACnetContextTagUnsignedInteger('0', 'BACnetDataType.UNSIGNED_INTEGER')              timeDuration        ]
             [simple   BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable('1')                    enableDisable       ]
             [optional BACnetContextTagCharacterString('2', 'BACnetDataType.CHARACTER_STRING')              password            ]
 
         ]
-        ['0x12' BACnetConfirmedServiceRequestConfirmedPrivateTransfer
+        ['CONFIRMED_PRIVATE_TRANSFER' BACnetConfirmedServiceRequestConfirmedPrivateTransfer
         ]
-        ['0x13' BACnetConfirmedServiceRequestConfirmedTextMessage
+        ['CONFIRMED_TEXT_MESSAGE' BACnetConfirmedServiceRequestConfirmedTextMessage
         ]
-        ['0x14' BACnetConfirmedServiceRequestReinitializeDevice
+        ['REINITIALIZE_DEVICE' BACnetConfirmedServiceRequestReinitializeDevice
           [simple BACnetContextTagDeviceState('0', 'BACnetDataType.BACNET_DEVICE_STATE')     reinitializedStateOfDevice  ]
           [optional BACnetContextTagCharacterString('1', 'BACnetDataType.CHARACTER_STRING')  password                    ]
         ]
 
-        ['0x15' BACnetConfirmedServiceRequestVTOpen
-        ]
-        ['0x16' BACnetConfirmedServiceRequestVTClose
-        ]
-        ['0x17' BACnetConfirmedServiceRequestVTData
-        ]
+        ////
+        //  Virtual Terminal Services
 
-        ['0x18' BACnetConfirmedServiceRequestRemovedAuthenticate
+        ['VT_OPEN' BACnetConfirmedServiceRequestVTOpen
+            // TODO: implement me
         ]
-        ['0x19' BACnetConfirmedServiceRequestRemovedRequestKey
+        ['VT_CLOSE' BACnetConfirmedServiceRequestVTClose
+            // TODO: implement me
         ]
-        ['0x0D' BACnetConfirmedServiceRequestRemovedReadPropertyConditional
+        ['VT_DATA' BACnetConfirmedServiceRequestVTData
+            // TODO: implement me
         ]
+        //
+        ////
 
-        ['0x1A' BACnetConfirmedServiceRequestReadRange
-        ]
-        ['0x1B' BACnetConfirmedServiceRequestLifeSafetyOperation
-        ]
-        ['0x1C' BACnetConfirmedServiceRequestSubscribeCOVProperty
+        ////
+        //  Removed Services
 
+        ['AUTHENTICATE' BACnetConfirmedServiceRequestAuthenticate
+            // TODO: implement me
         ]
-        ['0x1D' BACnetConfirmedServiceRequestGetEventInformation
-        ]
-
-        ['0x1E' BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple
+        ['REQUEST_KEY' BACnetConfirmedServiceRequestRequestKey
+            // TODO: implement me
         ]
-        ['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
+        ['READ_PROPERTY_CONDITIONAL' BACnetConfirmedServiceRequestReadPropertyConditional
+            // TODO: implement me
         ]
+        //
+        ////
+
         [BACnetConfirmedServiceRequestConfirmedUnknown
             [array  byte    unknownBytes length '(serviceRequestLength>0)?(serviceRequestLength - 1):0']
         ]
     ]
 ]
 
+[enum uint 8 BACnetConfirmedServiceChoice
+    ////
+    // Alarm and Event Services
+
+    ['0x00' ACKNOWLEDGE_ALARM                       ]
+    ['0x01' CONFIRMED_COV_NOTIFICATION              ]
+    ['0x1F' CONFIRMED_COV_NOTIFICATION_MULTIPLE     ]
+    ['0x02' CONFIRMED_EVENT_NOTIFICATION            ]
+    ['0x03' GET_ALARM_SUMMARY                       ]
+    ['0x04' GET_ENROLLMENT_SUMMARY                  ]
+    ['0x1D' GET_EVENT_INFORMATION                   ]
+    ['0x1B' LIFE_SAFETY_OPERATION                   ]
+    ['0x05' SUBSCRIBE_COV                           ]
+    ['0x1C' SUBSCRIBE_COV_PROPERTY                  ]
+    ['0x1E' SUBSCRIBE_COV_PROPERTY_MULTIPLE         ]
+    //
+    ////
+
+    ////
+    // File Access Services
+
+    ['0x06' ATOMIC_READ_FILE                        ]
+    ['0x07' ATOMIC_WRITE_FILE                       ]
+    //
+    ////
+
+    ////
+    // Object Access Services
+
+    ['0x08' ADD_LIST_ELEMENT                        ]
+    ['0x09' REMOVE_LIST_ELEMENT                     ]
+    ['0x0A' CREATE_OBJECT                           ]
+    ['0x0B' DELETE_OBJECT                           ]
+    ['0x0C' READ_PROPERTY                           ]
+    ['0x0E' READ_PROPERTY_MULTIPLE                  ]
+    ['0x1A' READ_RANGE                              ]
+    ['0x0F' WRITE_PROPERTY                          ]
+    ['0x10' WRITE_PROPERTY_MULTIPLE                 ]
+    //
+    ////
+
+    ////
+    // Remote Device Management Services
+
+    ['0x11' DEVICE_COMMUNICATION_CONTROL            ]
+    ['0x12' CONFIRMED_PRIVATE_TRANSFER              ]
+    ['0x13' CONFIRMED_TEXT_MESSAGE                  ]
+    ['0x14' REINITIALIZE_DEVICE                     ]
+    //
+    ////
+
+    ////
+    //  Virtual Terminal Services
+
+    ['0x15' VT_OPEN                                 ]
+    ['0x16' VT_CLOSE                                ]
+    ['0x17' VT_DATA                                 ]
+    //
+    ////
+
+    ////
+    //  Removed Services
+
+    ['0x18' AUTHENTICATE                            ]
+    ['0x19' REQUEST_KEY                             ]
+    ['0x0D' READ_PROPERTY_CONDITIONAL               ]
+    //
+    ////
+]
+
 [type BACnetReadAccessSpecification
     [simple   BACnetContextTagObjectIdentifier('0', 'BACnetDataType.BACNET_OBJECT_IDENTIFIER')
                     objectIdentifier                ]
diff --git a/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml
index 816b0ececb..2384c29544 100644
--- a/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml
+++ b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml
@@ -856,7 +856,9 @@
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1120,7 +1122,9 @@ make -f demo/object/ai</value>
                     <invokeId dataType="uint" bitLength="8">2</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1378,7 +1382,9 @@ make -f awf.mak</value>
                     <invokeId dataType="uint" bitLength="8">3</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1639,7 +1645,9 @@ make -f bacstr.mak</value>
                     <invokeId dataType="uint" bitLength="8">4</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -1897,7 +1905,9 @@ make -f crc.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">5</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2156,7 +2166,9 @@ make -f demo/object/lsp.</value>
                     <invokeId dataType="uint" bitLength="8">6</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2418,7 +2430,9 @@ make</value>
                     <invokeId dataType="uint" bitLength="8">7</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -2681,7 +2695,9 @@ make -f tsm.mak cle</value>
                     <invokeId dataType="uint" bitLength="8">8</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -3175,7 +3191,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -3617,7 +3635,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -4054,7 +4074,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -4491,7 +4513,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">12</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY">12</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -5493,7 +5517,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">15</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="WRITE_PROPERTY">15</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestWriteProperty>
                           <objectIdentifier>
                             <BACnetContextTag>
@@ -5985,7 +6011,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6387,7 +6415,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">1</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6736,7 +6766,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6849,7 +6881,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -6962,7 +6996,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7075,7 +7111,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">49</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7328,7 +7366,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">50</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -7538,7 +7578,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">51</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">17</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="DEVICE_COMMUNICATION_CONTROL">17</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestDeviceCommunicationControl>
                           <enableDisable>
                             <BACnetConfirmedServiceRequestReinitializeDeviceEnableDisable>
@@ -8146,7 +8188,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">52</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -8350,7 +8394,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">53</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">20</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="REINITIALIZE_DEVICE">20</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReinitializeDevice>
                           <reinitializedStateOfDevice>
                             <BACnetContextTag>
@@ -8508,7 +8554,9 @@ make -f wp.mak clean</value>
                     <invokeId dataType="uint" bitLength="8">54</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -8851,7 +8899,9 @@ Test "BACnet Applicat</value>
                     <invokeId dataType="uint" bitLength="8">55</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9199,7 +9249,9 @@ Test "BACnet I-Am":
                     <invokeId dataType="uint" bitLength="8">56</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9544,7 +9596,9 @@ Test "BACnet ReadProperty":
                     <invokeId dataType="uint" bitLength="8">57</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">6</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_READ_FILE">6</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicReadFile>
                           <fileIdentifier>
                             <BACnetApplicationTag>
@@ -9878,7 +9932,9 @@ Test "BACnet WriteProperty":
                     <invokeId dataType="uint" bitLength="8">58</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">7</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="ATOMIC_WRITE_FILE">7</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestAtomicWriteFile>
                           <deviceIdentifier>
                             <BACnetApplicationTag>
@@ -10111,7 +10167,9 @@ Test "BACnet Applicat</value>
                     <invokeId dataType="uint" bitLength="8">59</invokeId>
                     <serviceRequest>
                       <BACnetConfirmedServiceRequest>
-                        <serviceChoice dataType="uint" bitLength="8">14</serviceChoice>
+                        <serviceChoice>
+                          <BACnetConfirmedServiceChoice dataType="uint" bitLength="8" stringRepresentation="READ_PROPERTY_MULTIPLE">14</BACnetConfirmedServiceChoice>
+                        </serviceChoice>
                         <BACnetConfirmedServiceRequestReadPropertyMultiple>
                           <data isList="true">
                             <BACnetReadAccessSpecification>