diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionRequest.java
index 304bc423370..babb6524911 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionRequest.java
@@ -38,8 +38,8 @@
 public class ActivateSessionRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "467";
+  public Integer getExtensionId() {
+    return (int) 467;
   }
 
   // Properties.
@@ -190,7 +190,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ActivateSessionRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -200,8 +200,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     SignatureData clientSignature =
@@ -209,8 +208,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "clientSignature",
             new DataReaderComplexDefault<>(
                 () ->
-                    (SignatureData)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("458")),
+                    (SignatureData) ExtensionObjectDefinition.staticParse(readBuffer, (int) (458)),
                 readBuffer));
 
     int noOfClientSoftwareCertificates =
@@ -222,7 +220,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SignedSoftwareCertificate)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("346")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (346)),
                 readBuffer),
             noOfClientSoftwareCertificates);
 
@@ -245,8 +243,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "userTokenSignature",
             new DataReaderComplexDefault<>(
                 () ->
-                    (SignatureData)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("458")),
+                    (SignatureData) ExtensionObjectDefinition.staticParse(readBuffer, (int) (458)),
                 readBuffer));
 
     readBuffer.closeContext("ActivateSessionRequest");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionResponse.java
index 2c99c37f551..f0140a8e820 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ActivateSessionResponse.java
@@ -38,8 +38,8 @@
 public class ActivateSessionResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "470";
+  public Integer getExtensionId() {
+    return (int) 470;
   }
 
   // Properties.
@@ -154,7 +154,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ActivateSessionResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -164,8 +164,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     PascalByteString serverNonce =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesItem.java
index 99536186ce2..6218f7e466f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesItem.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesItem.java
@@ -38,8 +38,8 @@
 public class AddNodesItem extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "378";
+  public Integer getExtensionId() {
+    return (int) 378;
   }
 
   // Properties.
@@ -171,7 +171,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddNodesItem");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesRequest.java
index d3d21164b2c..6c5072482df 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesRequest.java
@@ -38,8 +38,8 @@
 public class AddNodesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "488";
+  public Integer getExtensionId() {
+    return (int) 488;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddNodesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -121,8 +121,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfNodesToAdd = readImplicitField("noOfNodesToAdd", readSignedInt(readBuffer, 32));
@@ -131,9 +130,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "nodesToAdd",
             new DataReaderComplexDefault<>(
-                () ->
-                    (AddNodesItem)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("378")),
+                () -> (AddNodesItem) ExtensionObjectDefinition.staticParse(readBuffer, (int) (378)),
                 readBuffer),
             noOfNodesToAdd);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResponse.java
index 61ad8c71b27..f6140884a60 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResponse.java
@@ -38,8 +38,8 @@
 public class AddNodesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "491";
+  public Integer getExtensionId() {
+    return (int) 491;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddNodesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -162,8 +161,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "results",
             new DataReaderComplexDefault<>(
                 () ->
-                    (AddNodesResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("485")),
+                    (AddNodesResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (485)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResult.java
index 86a5fca8bd3..9e89c17217e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddNodesResult.java
@@ -38,8 +38,8 @@
 public class AddNodesResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "485";
+  public Integer getExtensionId() {
+    return (int) 485;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddNodesResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java
index 1d437239bf9..858aba44066 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java
@@ -38,8 +38,8 @@
 public class AddReferencesItem extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "381";
+  public Integer getExtensionId() {
+    return (int) 381;
   }
 
   // Properties.
@@ -164,7 +164,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddReferencesItem");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesRequest.java
index 6f6b58b1e89..0b747ba0da9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesRequest.java
@@ -38,8 +38,8 @@
 public class AddReferencesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "494";
+  public Integer getExtensionId() {
+    return (int) 494;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddReferencesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -123,8 +123,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfReferencesToAdd =
@@ -136,7 +135,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (AddReferencesItem)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("381")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (381)),
                 readBuffer),
             noOfReferencesToAdd);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesResponse.java
index 72db9e14e56..fce64ef8af0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesResponse.java
@@ -38,8 +38,8 @@
 public class AddReferencesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "497";
+  public Integer getExtensionId() {
+    return (int) 497;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AddReferencesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AdditionalParametersType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AdditionalParametersType.java
index d058127e45d..850092bffee 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AdditionalParametersType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AdditionalParametersType.java
@@ -38,8 +38,8 @@
 public class AdditionalParametersType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "16315";
+  public Integer getExtensionId() {
+    return (int) 16315;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AdditionalParametersType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -111,8 +111,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "parameters",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfParameters);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java
index 19982b077cc..ac8ab8a28ff 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java
@@ -38,8 +38,8 @@
 public class AggregateConfiguration extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "950";
+  public Integer getExtensionId() {
+    return (int) 950;
   }
 
   // Properties.
@@ -151,7 +151,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AggregateConfiguration");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilter.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilter.java
index 4d111fad967..2dbf98f6605 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilter.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilter.java
@@ -38,8 +38,8 @@
 public class AggregateFilter extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "730";
+  public Integer getExtensionId() {
+    return (int) 730;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AggregateFilter");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -148,7 +148,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (AggregateConfiguration)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("950")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (950)),
                 readBuffer));
 
     readBuffer.closeContext("AggregateFilter");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilterResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilterResult.java
index 1f8e3060314..b70fe90f87b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilterResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateFilterResult.java
@@ -38,8 +38,8 @@
 public class AggregateFilterResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "739";
+  public Integer getExtensionId() {
+    return (int) 739;
   }
 
   // Properties.
@@ -116,7 +116,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AggregateFilterResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -132,7 +132,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (AggregateConfiguration)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("950")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (950)),
                 readBuffer));
 
     readBuffer.closeContext("AggregateFilterResult");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AliasNameDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AliasNameDataType.java
index aac83cfd07e..7a3c9665cc6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AliasNameDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AliasNameDataType.java
@@ -38,8 +38,8 @@
 public class AliasNameDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23470";
+  public Integer getExtensionId() {
+    return (int) 23470;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AliasNameDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Annotation.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Annotation.java
index 530e6adaf0a..1b098005af1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Annotation.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Annotation.java
@@ -38,8 +38,8 @@
 public class Annotation extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "893";
+  public Integer getExtensionId() {
+    return (int) 893;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Annotation");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AnnotationDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AnnotationDataType.java
index 3e5082f44e7..0842e94fdec 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AnnotationDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AnnotationDataType.java
@@ -38,8 +38,8 @@
 public class AnnotationDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32436";
+  public Integer getExtensionId() {
+    return (int) 32436;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AnnotationDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ApplicationDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ApplicationDescription.java
index 142939a46e4..16825ef7b89 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ApplicationDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ApplicationDescription.java
@@ -38,8 +38,8 @@
 public class ApplicationDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "310";
+  public Integer getExtensionId() {
+    return (int) 310;
   }
 
   // Properties.
@@ -187,7 +187,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ApplicationDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Argument.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Argument.java
index 545ba05ccc1..0f91f89969a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Argument.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Argument.java
@@ -38,8 +38,8 @@
 public class Argument extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "298";
+  public Integer getExtensionId() {
+    return (int) 298;
   }
 
   // Properties.
@@ -150,7 +150,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Argument");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AttributeOperand.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AttributeOperand.java
index 0c0ac105307..87783ba7366 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AttributeOperand.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AttributeOperand.java
@@ -38,8 +38,8 @@
 public class AttributeOperand extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "600";
+  public Integer getExtensionId() {
+    return (int) 600;
   }
 
   // Properties.
@@ -138,7 +138,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AttributeOperand");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -157,9 +157,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "browsePath",
             new DataReaderComplexDefault<>(
-                () ->
-                    (RelativePath)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("542")),
+                () -> (RelativePath) ExtensionObjectDefinition.staticParse(readBuffer, (int) (542)),
                 readBuffer));
 
     long attributeId = readSimpleField("attributeId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AxisInformation.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AxisInformation.java
index 8b0967dc989..3afb70b614a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AxisInformation.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AxisInformation.java
@@ -38,8 +38,8 @@
 public class AxisInformation extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12081";
+  public Integer getExtensionId() {
+    return (int) 12081;
   }
 
   // Properties.
@@ -156,7 +156,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("AxisInformation");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -166,15 +166,14 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "engineeringUnits",
             new DataReaderComplexDefault<>(
                 () ->
-                    (EUInformation)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("889")),
+                    (EUInformation) ExtensionObjectDefinition.staticParse(readBuffer, (int) (889)),
                 readBuffer));
 
     Range eURange =
         readSimpleField(
             "eURange",
             new DataReaderComplexDefault<>(
-                () -> (Range) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("886")),
+                () -> (Range) ExtensionObjectDefinition.staticParse(readBuffer, (int) (886)),
                 readBuffer));
 
     LocalizedText title =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryExtensionObjectWithMask.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryExtensionObjectWithMask.java
new file mode 100644
index 00000000000..4205a138143
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryExtensionObjectWithMask.java
@@ -0,0 +1,166 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public class BinaryExtensionObjectWithMask extends ExtensionObjectWithMask implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getEncodingMaskXmlBody() {
+    return (boolean) false;
+  }
+
+  public Boolean getEncodingMaskBinaryBody() {
+    return (boolean) true;
+  }
+
+  // Properties.
+  protected final ExtensionObjectDefinition body;
+
+  public BinaryExtensionObjectWithMask(
+      ExpandedNodeId typeId,
+      ExtensionObjectEncodingMask encodingMask,
+      ExtensionObjectDefinition body) {
+    super(typeId, encodingMask);
+    this.body = body;
+  }
+
+  public ExtensionObjectDefinition getBody() {
+    return body;
+  }
+
+  @Override
+  protected void serializeExtensionObjectWithMaskChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("BinaryExtensionObjectWithMask");
+
+    // Implicit Field (bodyLength) (Used for parsing, but its value is not stored as it's implicitly
+    // given by the objects content)
+    int bodyLength = (int) ((((getBody()) == (null)) ? 0 : getBody().getLengthInBytes()));
+    writeImplicitField("bodyLength", bodyLength, writeSignedInt(writeBuffer, 32));
+
+    // Simple Field (body)
+    writeSimpleField("body", body, new DataWriterComplexDefault<>(writeBuffer));
+
+    writeBuffer.popContext("BinaryExtensionObjectWithMask");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    BinaryExtensionObjectWithMask _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Implicit Field (bodyLength)
+    lengthInBits += 32;
+
+    // Simple field (body)
+    lengthInBits += body.getLengthInBits();
+
+    return lengthInBits;
+  }
+
+  public static ExtensionObjectWithMaskBuilder staticParseExtensionObjectWithMaskBuilder(
+      ReadBuffer readBuffer, Integer extensionId, Boolean includeEncodingMask)
+      throws ParseException {
+    readBuffer.pullContext("BinaryExtensionObjectWithMask");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    int bodyLength = readImplicitField("bodyLength", readSignedInt(readBuffer, 32));
+
+    ExtensionObjectDefinition body =
+        readSimpleField(
+            "body",
+            new DataReaderComplexDefault<>(
+                () -> ExtensionObjectDefinition.staticParse(readBuffer, (int) (extensionId)),
+                readBuffer));
+
+    readBuffer.closeContext("BinaryExtensionObjectWithMask");
+    // Create the instance
+    return new BinaryExtensionObjectWithMaskBuilderImpl(body);
+  }
+
+  public static class BinaryExtensionObjectWithMaskBuilderImpl
+      implements ExtensionObjectWithMask.ExtensionObjectWithMaskBuilder {
+    private final ExtensionObjectDefinition body;
+
+    public BinaryExtensionObjectWithMaskBuilderImpl(ExtensionObjectDefinition body) {
+      this.body = body;
+    }
+
+    public BinaryExtensionObjectWithMask build(
+        ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask) {
+      BinaryExtensionObjectWithMask binaryExtensionObjectWithMask =
+          new BinaryExtensionObjectWithMask(typeId, encodingMask, body);
+      return binaryExtensionObjectWithMask;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof BinaryExtensionObjectWithMask)) {
+      return false;
+    }
+    BinaryExtensionObjectWithMask that = (BinaryExtensionObjectWithMask) o;
+    return (getBody() == that.getBody()) && super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), getBody());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryWireExtensionObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryWireExtensionObject.java
new file mode 100644
index 00000000000..7841a4a5c6e
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BinaryWireExtensionObject.java
@@ -0,0 +1,161 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public class BinaryWireExtensionObject extends EncodedObject implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getEncodingMaskXmlBody() {
+    return (boolean) false;
+  }
+
+  public Boolean getEncodingMaskBinaryBody() {
+    return (boolean) true;
+  }
+
+  // Properties.
+  protected final ExtensionObjectDefinition body;
+
+  public BinaryWireExtensionObject(ExtensionObjectDefinition body) {
+    super();
+    this.body = body;
+  }
+
+  public ExtensionObjectDefinition getBody() {
+    return body;
+  }
+
+  @Override
+  protected void serializeEncodedObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("BinaryWireExtensionObject");
+
+    // Implicit Field (bodyLength) (Used for parsing, but its value is not stored as it's implicitly
+    // given by the objects content)
+    int bodyLength = (int) ((((getBody()) == (null)) ? 0 : getBody().getLengthInBytes()));
+    writeImplicitField("bodyLength", bodyLength, writeSignedInt(writeBuffer, 32));
+
+    // Simple Field (body)
+    writeSimpleField("body", body, new DataWriterComplexDefault<>(writeBuffer));
+
+    writeBuffer.popContext("BinaryWireExtensionObject");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    BinaryWireExtensionObject _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Implicit Field (bodyLength)
+    lengthInBits += 32;
+
+    // Simple field (body)
+    lengthInBits += body.getLengthInBits();
+
+    return lengthInBits;
+  }
+
+  public static EncodedObjectBuilder staticParseEncodedObjectBuilder(
+      ReadBuffer readBuffer, Integer extensionId, ExtensionObjectEncodingMask encodingMask)
+      throws ParseException {
+    readBuffer.pullContext("BinaryWireExtensionObject");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    int bodyLength = readImplicitField("bodyLength", readSignedInt(readBuffer, 32));
+
+    ExtensionObjectDefinition body =
+        readSimpleField(
+            "body",
+            new DataReaderComplexDefault<>(
+                () -> ExtensionObjectDefinition.staticParse(readBuffer, (int) (extensionId)),
+                readBuffer));
+
+    readBuffer.closeContext("BinaryWireExtensionObject");
+    // Create the instance
+    return new BinaryWireExtensionObjectBuilderImpl(body);
+  }
+
+  public static class BinaryWireExtensionObjectBuilderImpl
+      implements EncodedObject.EncodedObjectBuilder {
+    private final ExtensionObjectDefinition body;
+
+    public BinaryWireExtensionObjectBuilderImpl(ExtensionObjectDefinition body) {
+      this.body = body;
+    }
+
+    public BinaryWireExtensionObject build() {
+      BinaryWireExtensionObject binaryWireExtensionObject = new BinaryWireExtensionObject(body);
+      return binaryWireExtensionObject;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof BinaryWireExtensionObject)) {
+      return false;
+    }
+    BinaryWireExtensionObject that = (BinaryWireExtensionObject) o;
+    return (getBody() == that.getBody()) && super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), getBody());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BitFieldDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BitFieldDefinition.java
index ab919aae9eb..9be9086998e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BitFieldDefinition.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BitFieldDefinition.java
@@ -38,8 +38,8 @@
 public class BitFieldDefinition extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32423";
+  public Integer getExtensionId() {
+    return (int) 32423;
   }
 
   // Properties.
@@ -138,7 +138,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BitFieldDefinition");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerConnectionTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerConnectionTransportDataType.java
index b949f0b7231..12db7894a35 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerConnectionTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerConnectionTransportDataType.java
@@ -39,8 +39,8 @@ public class BrokerConnectionTransportDataType extends ExtensionObjectDefinition
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15009";
+  public Integer getExtensionId() {
+    return (int) 15009;
   }
 
   // Properties.
@@ -102,7 +102,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrokerConnectionTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetReaderTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetReaderTransportDataType.java
index 0445aa708da..bcbbb43490a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetReaderTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetReaderTransportDataType.java
@@ -39,8 +39,8 @@ public class BrokerDataSetReaderTransportDataType extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15672";
+  public Integer getExtensionId() {
+    return (int) 15672;
   }
 
   // Properties.
@@ -150,7 +150,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrokerDataSetReaderTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetWriterTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetWriterTransportDataType.java
index dad8af49507..00ee698b91c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetWriterTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerDataSetWriterTransportDataType.java
@@ -39,8 +39,8 @@ public class BrokerDataSetWriterTransportDataType extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15671";
+  public Integer getExtensionId() {
+    return (int) 15671;
   }
 
   // Properties.
@@ -163,7 +163,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrokerDataSetWriterTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerWriterGroupTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerWriterGroupTransportDataType.java
index 650ffb5974c..7f263e37e13 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerWriterGroupTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrokerWriterGroupTransportDataType.java
@@ -39,8 +39,8 @@ public class BrokerWriterGroupTransportDataType extends ExtensionObjectDefinitio
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15669";
+  public Integer getExtensionId() {
+    return (int) 15669;
   }
 
   // Properties.
@@ -136,7 +136,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrokerWriterGroupTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java
index 58ed038a3f1..acf50ccdb4c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java
@@ -38,8 +38,8 @@
 public class BrowseDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "516";
+  public Integer getExtensionId() {
+    return (int) 516;
   }
 
   // Properties.
@@ -163,7 +163,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java
index 1b17309d5c6..e0df33478f1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java
@@ -38,8 +38,8 @@
 public class BrowseNextRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "533";
+  public Integer getExtensionId() {
+    return (int) 533;
   }
 
   // Properties.
@@ -135,7 +135,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseNextRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -145,8 +145,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     Byte reservedField0 =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextResponse.java
index 68846641386..c62db2a1b5f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextResponse.java
@@ -38,8 +38,8 @@
 public class BrowseNextResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "536";
+  public Integer getExtensionId() {
+    return (int) 536;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseNextResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -161,9 +160,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "results",
             new DataReaderComplexDefault<>(
-                () ->
-                    (BrowseResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("524")),
+                () -> (BrowseResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (524)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePath.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePath.java
index 65256ba2893..3c8705c0000 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePath.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePath.java
@@ -38,8 +38,8 @@
 public class BrowsePath extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "545";
+  public Integer getExtensionId() {
+    return (int) 545;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowsePath");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -111,9 +111,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "relativePath",
             new DataReaderComplexDefault<>(
-                () ->
-                    (RelativePath)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("542")),
+                () -> (RelativePath) ExtensionObjectDefinition.staticParse(readBuffer, (int) (542)),
                 readBuffer));
 
     readBuffer.closeContext("BrowsePath");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathResult.java
index 5c82db56e93..c0bf1903080 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathResult.java
@@ -38,8 +38,8 @@
 public class BrowsePathResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "551";
+  public Integer getExtensionId() {
+    return (int) 551;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowsePathResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -129,7 +129,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (BrowsePathTarget)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("548")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (548)),
                 readBuffer),
             noOfTargets);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathTarget.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathTarget.java
index 3a67071b59a..ca0b710f9f6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathTarget.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowsePathTarget.java
@@ -38,8 +38,8 @@
 public class BrowsePathTarget extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "548";
+  public Integer getExtensionId() {
+    return (int) 548;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowsePathTarget");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseRequest.java
index a5c6b90e83e..371d816f5ab 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseRequest.java
@@ -38,8 +38,8 @@
 public class BrowseRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "527";
+  public Integer getExtensionId() {
+    return (int) 527;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -153,8 +153,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     ViewDescription view =
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ViewDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("513")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (513)),
                 readBuffer));
 
     long requestedMaxReferencesPerNode =
@@ -177,7 +176,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (BrowseDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("516")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (516)),
                 readBuffer),
             noOfNodesToBrowse);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResponse.java
index 3e4f1ab85f9..4e2f6b3a757 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResponse.java
@@ -38,8 +38,8 @@
 public class BrowseResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "530";
+  public Integer getExtensionId() {
+    return (int) 530;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -161,9 +160,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "results",
             new DataReaderComplexDefault<>(
-                () ->
-                    (BrowseResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("524")),
+                () -> (BrowseResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (524)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResult.java
index 63638f0186a..38a06d3a899 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseResult.java
@@ -38,8 +38,8 @@
 public class BrowseResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "524";
+  public Integer getExtensionId() {
+    return (int) 524;
   }
 
   // Properties.
@@ -127,7 +127,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BrowseResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,7 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ReferenceDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("520")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (520)),
                 readBuffer),
             noOfReferences);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BuildInfo.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BuildInfo.java
index be08e26c156..36f725a8d0d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BuildInfo.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BuildInfo.java
@@ -38,8 +38,8 @@
 public class BuildInfo extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "340";
+  public Integer getExtensionId() {
+    return (int) 340;
   }
 
   // Properties.
@@ -153,7 +153,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("BuildInfo");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodRequest.java
index c051301fae0..7d4b47de7e0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodRequest.java
@@ -38,8 +38,8 @@
 public class CallMethodRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "706";
+  public Integer getExtensionId() {
+    return (int) 706;
   }
 
   // Properties.
@@ -124,7 +124,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CallMethodRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodResult.java
index d79243c1412..440349f9a4e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallMethodResult.java
@@ -38,8 +38,8 @@
 public class CallMethodResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "709";
+  public Integer getExtensionId() {
+    return (int) 709;
   }
 
   // Properties.
@@ -178,7 +178,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CallMethodResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallRequest.java
index 9f9694f38ef..9b3beb5c81b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallRequest.java
@@ -38,8 +38,8 @@
 public class CallRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "712";
+  public Integer getExtensionId() {
+    return (int) 712;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CallRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -122,8 +122,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfMethodsToCall = readImplicitField("noOfMethodsToCall", readSignedInt(readBuffer, 32));
@@ -134,7 +133,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (CallMethodRequest)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("706")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (706)),
                 readBuffer),
             noOfMethodsToCall);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallResponse.java
index e2e5a2989a0..3ebae0f663d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CallResponse.java
@@ -38,8 +38,8 @@
 public class CallResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "715";
+  public Integer getExtensionId() {
+    return (int) 715;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CallResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (CallMethodResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("709")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (709)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelRequest.java
index 61460ce1d29..d5d0532ce34 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelRequest.java
@@ -38,8 +38,8 @@
 public class CancelRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "479";
+  public Integer getExtensionId() {
+    return (int) 479;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CancelRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -107,8 +107,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long requestHandle = readSimpleField("requestHandle", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelResponse.java
index 87d9ed29552..85eeab4d31f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CancelResponse.java
@@ -38,8 +38,8 @@
 public class CancelResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "482";
+  public Integer getExtensionId() {
+    return (int) 482;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CancelResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -107,8 +107,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     long cancelCount = readSimpleField("cancelCount", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CartesianCoordinates.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CartesianCoordinates.java
index b7531d0f306..cdce08b1323 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CartesianCoordinates.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CartesianCoordinates.java
@@ -38,8 +38,8 @@
 public class CartesianCoordinates extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "18811";
+  public Integer getExtensionId() {
+    return (int) 18811;
   }
 
   public CartesianCoordinates() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CartesianCoordinates");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ChannelSecurityToken.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ChannelSecurityToken.java
index b847cd16827..aa84f8d64e7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ChannelSecurityToken.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ChannelSecurityToken.java
@@ -38,8 +38,8 @@
 public class ChannelSecurityToken extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "443";
+  public Integer getExtensionId() {
+    return (int) 443;
   }
 
   // Properties.
@@ -121,7 +121,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ChannelSecurityToken");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelRequest.java
index 3ecf60faa85..4b86600709b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelRequest.java
@@ -38,8 +38,8 @@
 public class CloseSecureChannelRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "452";
+  public Integer getExtensionId() {
+    return (int) 452;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CloseSecureChannelRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     readBuffer.closeContext("CloseSecureChannelRequest");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelResponse.java
index bab86b07ab9..76ba77ba146 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSecureChannelResponse.java
@@ -38,8 +38,8 @@
 public class CloseSecureChannelResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "455";
+  public Integer getExtensionId() {
+    return (int) 455;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CloseSecureChannelResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     readBuffer.closeContext("CloseSecureChannelResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java
index 95469b5b5b4..1cd515bc8d5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java
@@ -38,8 +38,8 @@
 public class CloseSessionRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "473";
+  public Integer getExtensionId() {
+    return (int) 473;
   }
 
   // Properties.
@@ -103,7 +103,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CloseSessionRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -113,8 +113,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     Byte reservedField0 =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionResponse.java
index b52b55b31fd..4dfb221024c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionResponse.java
@@ -38,8 +38,8 @@
 public class CloseSessionResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "476";
+  public Integer getExtensionId() {
+    return (int) 476;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CloseSessionResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     readBuffer.closeContext("CloseSessionResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ComplexNumberType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ComplexNumberType.java
index 4d8383ba4e4..2d97a7b824c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ComplexNumberType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ComplexNumberType.java
@@ -38,8 +38,8 @@
 public class ComplexNumberType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12173";
+  public Integer getExtensionId() {
+    return (int) 12173;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ComplexNumberType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConfigurationVersionDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConfigurationVersionDataType.java
index 9e97dc476da..e545d4f93fe 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConfigurationVersionDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConfigurationVersionDataType.java
@@ -38,8 +38,8 @@
 public class ConfigurationVersionDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14595";
+  public Integer getExtensionId() {
+    return (int) 14595;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ConfigurationVersionDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConnectionTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConnectionTransportDataType.java
index 531aa7f5173..717ca23971f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConnectionTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ConnectionTransportDataType.java
@@ -38,8 +38,8 @@
 public class ConnectionTransportDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15620";
+  public Integer getExtensionId() {
+    return (int) 15620;
   }
 
   public ConnectionTransportDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ConnectionTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilter.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilter.java
index b8e01ad4a81..3616cf4028a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilter.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilter.java
@@ -38,8 +38,8 @@
 public class ContentFilter extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "588";
+  public Integer getExtensionId() {
+    return (int) 588;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ContentFilter");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -112,7 +112,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ContentFilterElement)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("585")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (585)),
                 readBuffer),
             noOfElements);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElement.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElement.java
index 6d3c9c1425b..3fc30caad1b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElement.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElement.java
@@ -38,8 +38,8 @@
 public class ContentFilterElement extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "585";
+  public Integer getExtensionId() {
+    return (int) 585;
   }
 
   // Properties.
@@ -117,7 +117,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ContentFilterElement");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElementResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElementResult.java
index c2d5976f959..c5eff627189 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElementResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterElementResult.java
@@ -38,8 +38,8 @@
 public class ContentFilterElementResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "606";
+  public Integer getExtensionId() {
+    return (int) 606;
   }
 
   // Properties.
@@ -147,7 +147,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ContentFilterElementResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterResult.java
index d08a1043bc5..a18d852cdf3 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ContentFilterResult.java
@@ -38,8 +38,8 @@
 public class ContentFilterResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "609";
+  public Integer getExtensionId() {
+    return (int) 609;
   }
 
   // Properties.
@@ -133,7 +133,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ContentFilterResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -146,7 +146,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ContentFilterElementResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("606")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (606)),
                 readBuffer),
             noOfElementResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsRequest.java
index ad4a1a6cf8b..9df4058898f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsRequest.java
@@ -38,8 +38,8 @@
 public class CreateMonitoredItemsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "751";
+  public Integer getExtensionId() {
+    return (int) 751;
   }
 
   // Properties.
@@ -147,7 +147,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateMonitoredItemsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -157,8 +157,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
@@ -178,7 +177,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoredItemCreateRequest)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("745")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (745)),
                 readBuffer),
             noOfItemsToCreate);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsResponse.java
index 35efce52fe2..bb40df46114 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateMonitoredItemsResponse.java
@@ -38,8 +38,8 @@
 public class CreateMonitoredItemsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "754";
+  public Integer getExtensionId() {
+    return (int) 754;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateMonitoredItemsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoredItemCreateResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("748")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (748)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionRequest.java
index ff888f12f8f..d3d2a18daac 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionRequest.java
@@ -38,8 +38,8 @@
 public class CreateSessionRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "461";
+  public Integer getExtensionId() {
+    return (int) 461;
   }
 
   // Properties.
@@ -194,7 +194,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateSessionRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -204,8 +204,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     ApplicationDescription clientDescription =
@@ -214,7 +213,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ApplicationDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("310")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (310)),
                 readBuffer));
 
     PascalString serverUri =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionResponse.java
index d7cb22e5c86..5b42b12d9a8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSessionResponse.java
@@ -38,8 +38,8 @@
 public class CreateSessionResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "464";
+  public Integer getExtensionId() {
+    return (int) 464;
   }
 
   // Properties.
@@ -244,7 +244,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateSessionResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -254,8 +254,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     NodeId sessionId =
@@ -292,7 +291,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfServerEndpoints);
 
@@ -305,7 +304,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SignedSoftwareCertificate)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("346")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (346)),
                 readBuffer),
             noOfServerSoftwareCertificates);
 
@@ -314,8 +313,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "serverSignature",
             new DataReaderComplexDefault<>(
                 () ->
-                    (SignatureData)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("458")),
+                    (SignatureData) ExtensionObjectDefinition.staticParse(readBuffer, (int) (458)),
                 readBuffer));
 
     long maxRequestMessageSize =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java
index ed942aa63d9..29505ca189f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java
@@ -38,8 +38,8 @@
 public class CreateSubscriptionRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "787";
+  public Integer getExtensionId() {
+    return (int) 787;
   }
 
   // Properties.
@@ -178,7 +178,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateSubscriptionRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -188,8 +188,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     double requestedPublishingInterval =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionResponse.java
index c51581196e1..1846f341244 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionResponse.java
@@ -38,8 +38,8 @@
 public class CreateSubscriptionResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "790";
+  public Integer getExtensionId() {
+    return (int) 790;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CreateSubscriptionResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CurrencyUnitType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CurrencyUnitType.java
index 9a232e1f2e9..43c16703676 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CurrencyUnitType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CurrencyUnitType.java
@@ -38,8 +38,8 @@
 public class CurrencyUnitType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23500";
+  public Integer getExtensionId() {
+    return (int) 23500;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("CurrencyUnitType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeFilter.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeFilter.java
index 6b35320f685..d89c2196ca6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeFilter.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeFilter.java
@@ -38,8 +38,8 @@
 public class DataChangeFilter extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "724";
+  public Integer getExtensionId() {
+    return (int) 724;
   }
 
   // Properties.
@@ -116,7 +116,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataChangeFilter");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeNotification.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeNotification.java
index 8440a7c76af..46216dc3c3c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeNotification.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataChangeNotification.java
@@ -38,8 +38,8 @@
 public class DataChangeNotification extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "811";
+  public Integer getExtensionId() {
+    return (int) 811;
   }
 
   // Properties.
@@ -68,11 +68,6 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer)
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext("DataChangeNotification");
 
-    // Implicit Field (size) (Used for parsing, but its value is not stored as it's implicitly given
-    // by the objects content)
-    int size = (int) ((getLengthInBytes()) - (4));
-    writeImplicitField("size", size, writeSignedInt(writeBuffer, 32));
-
     // Implicit Field (noOfMonitoredItems) (Used for parsing, but its value is not stored as it's
     // implicitly given by the objects content)
     int noOfMonitoredItems =
@@ -105,9 +100,6 @@ public int getLengthInBits() {
     DataChangeNotification _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    // Implicit Field (size)
-    lengthInBits += 32;
-
     // Implicit Field (noOfMonitoredItems)
     lengthInBits += 32;
 
@@ -136,13 +128,11 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataChangeNotification");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    int size = readImplicitField("size", readSignedInt(readBuffer, 32));
-
     int noOfMonitoredItems = readImplicitField("noOfMonitoredItems", readSignedInt(readBuffer, 32));
 
     List<MonitoredItemNotification> monitoredItems =
@@ -151,7 +141,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoredItemNotification)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("808")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (808)),
                 readBuffer),
             noOfMonitoredItems);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetMetaDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetMetaDataType.java
index 6d2c52ac1d1..d309ef6aba2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetMetaDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetMetaDataType.java
@@ -38,8 +38,8 @@
 public class DataSetMetaDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14525";
+  public Integer getExtensionId() {
+    return (int) 14525;
   }
 
   // Properties.
@@ -265,7 +265,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetMetaDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -287,7 +287,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (StructureDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15489")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15489)),
                 readBuffer),
             noOfStructureDataTypes);
 
@@ -299,7 +299,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EnumDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15490")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15490)),
                 readBuffer),
             noOfEnumDataTypes);
 
@@ -312,7 +312,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SimpleTypeDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15007")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15007)),
                 readBuffer),
             noOfSimpleDataTypes);
 
@@ -335,7 +335,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (FieldMetaData)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14526")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14526)),
                 readBuffer),
             noOfFields);
 
@@ -350,7 +350,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ConfigurationVersionDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14595")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14595)),
                 readBuffer));
 
     readBuffer.closeContext("DataSetMetaDataType");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderDataType.java
index a9b6249048d..33ed3db5e0f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderDataType.java
@@ -38,8 +38,8 @@
 public class DataSetReaderDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15625";
+  public Integer getExtensionId() {
+    return (int) 15625;
   }
 
   // Properties.
@@ -357,7 +357,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetReaderDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -387,7 +387,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetMetaDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14525")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14525)),
                 readBuffer));
 
     DataSetFieldContentMask dataSetFieldContentMask =
@@ -428,7 +428,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfSecurityKeyServices);
 
@@ -440,8 +440,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "dataSetReaderProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfDataSetReaderProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderMessageDataType.java
index 0971a8648fd..c58feef271f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderMessageDataType.java
@@ -38,8 +38,8 @@
 public class DataSetReaderMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15631";
+  public Integer getExtensionId() {
+    return (int) 15631;
   }
 
   public DataSetReaderMessageDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetReaderMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderTransportDataType.java
index 216ae5b9f19..e514cbda075 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetReaderTransportDataType.java
@@ -38,8 +38,8 @@
 public class DataSetReaderTransportDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15630";
+  public Integer getExtensionId() {
+    return (int) 15630;
   }
 
   public DataSetReaderTransportDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetReaderTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java
index 274d33d52d5..f8166d5a731 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java
@@ -38,8 +38,8 @@
 public class DataSetWriterDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15599";
+  public Integer getExtensionId() {
+    return (int) 15599;
   }
 
   // Properties.
@@ -226,7 +226,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetWriterDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -265,8 +265,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "dataSetWriterProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfDataSetWriterProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterMessageDataType.java
index 262898bdcda..fc972c0752a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterMessageDataType.java
@@ -38,8 +38,8 @@
 public class DataSetWriterMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15607";
+  public Integer getExtensionId() {
+    return (int) 15607;
   }
 
   public DataSetWriterMessageDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetWriterMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterTransportDataType.java
index 5ed6e810295..04b0192348c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterTransportDataType.java
@@ -38,8 +38,8 @@
 public class DataSetWriterTransportDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15600";
+  public Integer getExtensionId() {
+    return (int) 15600;
   }
 
   public DataSetWriterTransportDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataSetWriterTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeAttributes.java
index 956a6a4771b..ca1e802f257 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeAttributes.java
@@ -38,8 +38,8 @@
 public class DataTypeAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "372";
+  public Integer getExtensionId() {
+    return (int) 372;
   }
 
   // Properties.
@@ -158,7 +158,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataTypeAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDefinition.java
index 9ea44ac18c8..a09b0590046 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDefinition.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDefinition.java
@@ -38,8 +38,8 @@
 public class DataTypeDefinition extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "99";
+  public Integer getExtensionId() {
+    return (int) 99;
   }
 
   public DataTypeDefinition() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataTypeDefinition");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDescription.java
index 5bd8ba860d6..3c73f215e01 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeDescription.java
@@ -38,8 +38,8 @@
 public class DataTypeDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14527";
+  public Integer getExtensionId() {
+    return (int) 14527;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataTypeDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeSchemaHeader.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeSchemaHeader.java
index 00327d06559..82a964a2b7e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeSchemaHeader.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataTypeSchemaHeader.java
@@ -38,8 +38,8 @@
 public class DataTypeSchemaHeader extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15536";
+  public Integer getExtensionId() {
+    return (int) 15536;
   }
 
   // Properties.
@@ -185,7 +185,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DataTypeSchemaHeader");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -207,7 +207,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (StructureDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15489")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15489)),
                 readBuffer),
             noOfStructureDataTypes);
 
@@ -219,7 +219,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EnumDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15490")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15490)),
                 readBuffer),
             noOfEnumDataTypes);
 
@@ -232,7 +232,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SimpleTypeDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15007")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15007)),
                 readBuffer),
             noOfSimpleDataTypes);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransport2DataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransport2DataType.java
index d023d78c128..0970a21434d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransport2DataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransport2DataType.java
@@ -39,8 +39,8 @@ public class DatagramConnectionTransport2DataType extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23614";
+  public Integer getExtensionId() {
+    return (int) 23614;
   }
 
   // Properties.
@@ -156,7 +156,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DatagramConnectionTransport2DataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransportDataType.java
index 58d28803ae3..273c2d3b592 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramConnectionTransportDataType.java
@@ -39,8 +39,8 @@ public class DatagramConnectionTransportDataType extends ExtensionObjectDefiniti
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "17469";
+  public Integer getExtensionId() {
+    return (int) 17469;
   }
 
   // Properties.
@@ -87,7 +87,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DatagramConnectionTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramDataSetReaderTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramDataSetReaderTransportDataType.java
index 040a53e9719..14dd8afd4c9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramDataSetReaderTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramDataSetReaderTransportDataType.java
@@ -39,8 +39,8 @@ public class DatagramDataSetReaderTransportDataType extends ExtensionObjectDefin
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23616";
+  public Integer getExtensionId() {
+    return (int) 23616;
   }
 
   // Properties.
@@ -140,7 +140,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DatagramDataSetReaderTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransport2DataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransport2DataType.java
index 4f8e85ce92c..74f7a53c153 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransport2DataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransport2DataType.java
@@ -39,8 +39,8 @@ public class DatagramWriterGroupTransport2DataType extends ExtensionObjectDefini
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23615";
+  public Integer getExtensionId() {
+    return (int) 23615;
   }
 
   // Properties.
@@ -180,7 +180,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DatagramWriterGroupTransport2DataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransportDataType.java
index 7cc6374027f..07289282b1b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DatagramWriterGroupTransportDataType.java
@@ -39,8 +39,8 @@ public class DatagramWriterGroupTransportDataType extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15534";
+  public Integer getExtensionId() {
+    return (int) 15534;
   }
 
   // Properties.
@@ -98,7 +98,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DatagramWriterGroupTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteAtTimeDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteAtTimeDetails.java
index 0f515870c72..feb5ad2d500 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteAtTimeDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteAtTimeDetails.java
@@ -38,8 +38,8 @@
 public class DeleteAtTimeDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "691";
+  public Integer getExtensionId() {
+    return (int) 691;
   }
 
   // Properties.
@@ -107,7 +107,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteAtTimeDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteEventDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteEventDetails.java
index c228c0ebe41..eaf8455237e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteEventDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteEventDetails.java
@@ -38,8 +38,8 @@
 public class DeleteEventDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "694";
+  public Integer getExtensionId() {
+    return (int) 694;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteEventDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsRequest.java
index 6aa89a24505..370bec22a02 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsRequest.java
@@ -38,8 +38,8 @@
 public class DeleteMonitoredItemsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "781";
+  public Integer getExtensionId() {
+    return (int) 781;
   }
 
   // Properties.
@@ -123,7 +123,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteMonitoredItemsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -133,8 +133,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsResponse.java
index 6fae7c12022..a0cb5560f4d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteMonitoredItemsResponse.java
@@ -38,8 +38,8 @@
 public class DeleteMonitoredItemsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "784";
+  public Integer getExtensionId() {
+    return (int) 784;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteMonitoredItemsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java
index a0615fd399d..f028e242dab 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java
@@ -38,8 +38,8 @@
 public class DeleteNodesItem extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "384";
+  public Integer getExtensionId() {
+    return (int) 384;
   }
 
   // Properties.
@@ -103,7 +103,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteNodesItem");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesRequest.java
index e0b56e87420..7c1306864e0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesRequest.java
@@ -38,8 +38,8 @@
 public class DeleteNodesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "500";
+  public Integer getExtensionId() {
+    return (int) 500;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteNodesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -122,8 +122,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfNodesToDelete = readImplicitField("noOfNodesToDelete", readSignedInt(readBuffer, 32));
@@ -134,7 +133,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DeleteNodesItem)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("384")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (384)),
                 readBuffer),
             noOfNodesToDelete);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesResponse.java
index 8f1547e7ecb..35b671c91f0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesResponse.java
@@ -38,8 +38,8 @@
 public class DeleteNodesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "503";
+  public Integer getExtensionId() {
+    return (int) 503;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteNodesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteRawModifiedDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteRawModifiedDetails.java
index 2472504ac34..cc2860d3680 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteRawModifiedDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteRawModifiedDetails.java
@@ -38,8 +38,8 @@
 public class DeleteRawModifiedDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "688";
+  public Integer getExtensionId() {
+    return (int) 688;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteRawModifiedDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java
index fa7b7ee07d8..52dfc8ab179 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java
@@ -38,8 +38,8 @@
 public class DeleteReferencesItem extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "387";
+  public Integer getExtensionId() {
+    return (int) 387;
   }
 
   // Properties.
@@ -151,7 +151,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteReferencesItem");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesRequest.java
index d789f942089..2ad009167fb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesRequest.java
@@ -38,8 +38,8 @@
 public class DeleteReferencesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "506";
+  public Integer getExtensionId() {
+    return (int) 506;
   }
 
   // Properties.
@@ -114,7 +114,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteReferencesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -124,8 +124,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfReferencesToDelete =
@@ -137,7 +136,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DeleteReferencesItem)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("387")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (387)),
                 readBuffer),
             noOfReferencesToDelete);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesResponse.java
index 6843b6fd592..f241a7ad603 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesResponse.java
@@ -38,8 +38,8 @@
 public class DeleteReferencesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "509";
+  public Integer getExtensionId() {
+    return (int) 509;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteReferencesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsRequest.java
index e8dc7ab4e02..830ba152fc5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsRequest.java
@@ -38,8 +38,8 @@
 public class DeleteSubscriptionsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "847";
+  public Integer getExtensionId() {
+    return (int) 847;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteSubscriptionsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -119,8 +119,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfSubscriptionIds =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsResponse.java
index dabea0f0e37..8886180a352 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteSubscriptionsResponse.java
@@ -38,8 +38,8 @@
 public class DeleteSubscriptionsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "850";
+  public Integer getExtensionId() {
+    return (int) 850;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DeleteSubscriptionsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DiscoveryConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DiscoveryConfiguration.java
index 06abbdd61ba..19a4a2eb826 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DiscoveryConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DiscoveryConfiguration.java
@@ -38,8 +38,8 @@
 public class DiscoveryConfiguration extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12892";
+  public Integer getExtensionId() {
+    return (int) 12892;
   }
 
   public DiscoveryConfiguration() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DiscoveryConfiguration");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DoubleComplexNumberType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DoubleComplexNumberType.java
index c5f17dc1cf2..52d5c009407 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DoubleComplexNumberType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DoubleComplexNumberType.java
@@ -38,8 +38,8 @@
 public class DoubleComplexNumberType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12174";
+  public Integer getExtensionId() {
+    return (int) 12174;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("DoubleComplexNumberType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EUInformation.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EUInformation.java
index 3d900fb250f..c3fe39b7366 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EUInformation.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EUInformation.java
@@ -38,8 +38,8 @@
 public class EUInformation extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "889";
+  public Integer getExtensionId() {
+    return (int) 889;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EUInformation");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ElementOperand.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ElementOperand.java
index 3c3dd626843..6148dd6f7b8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ElementOperand.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ElementOperand.java
@@ -38,8 +38,8 @@
 public class ElementOperand extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "594";
+  public Integer getExtensionId() {
+    return (int) 594;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ElementOperand");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EncodedObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EncodedObject.java
new file mode 100644
index 00000000000..bb4300ec189
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EncodedObject.java
@@ -0,0 +1,179 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public abstract class EncodedObject implements Message {
+
+  // Abstract accessors for discriminator values.
+  public abstract Boolean getEncodingMaskBinaryBody();
+
+  public abstract Boolean getEncodingMaskXmlBody();
+
+  public EncodedObject() {
+    super();
+  }
+
+  public abstract ExtensionObjectDefinition getBody();
+
+  protected abstract void serializeEncodedObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException;
+
+  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("EncodedObject");
+
+    // Switch field (Serialize the sub-type)
+    serializeEncodedObjectChild(writeBuffer);
+
+    writeBuffer.popContext("EncodedObject");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = 0;
+    EncodedObject _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Length of sub-type elements will be added by sub-type...
+
+    return lengthInBits;
+  }
+
+  public static EncodedObject staticParse(ReadBuffer readBuffer, Object... args)
+      throws ParseException {
+    PositionAware positionAware = readBuffer;
+    if ((args == null) || (args.length != 2)) {
+      throw new PlcRuntimeException(
+          "Wrong number of arguments, expected 2, but got " + args.length);
+    }
+    Integer extensionId;
+    if (args[0] instanceof Integer) {
+      extensionId = (Integer) args[0];
+    } else if (args[0] instanceof String) {
+      extensionId = Integer.valueOf((String) args[0]);
+    } else {
+      throw new PlcRuntimeException(
+          "Argument 0 expected to be of type Integer or a string which is parseable but was "
+              + args[0].getClass().getName());
+    }
+    ExtensionObjectEncodingMask encodingMask;
+    if (args[1] instanceof ExtensionObjectEncodingMask) {
+      encodingMask = (ExtensionObjectEncodingMask) args[1];
+    } else {
+      throw new PlcRuntimeException(
+          "Argument 1 expected to be of type ExtensionObjectEncodingMask or a string which is"
+              + " parseable but was "
+              + args[1].getClass().getName());
+    }
+    return staticParse(readBuffer, extensionId, encodingMask);
+  }
+
+  public static EncodedObject staticParse(
+      ReadBuffer readBuffer, Integer extensionId, ExtensionObjectEncodingMask encodingMask)
+      throws ParseException {
+    readBuffer.pullContext("EncodedObject");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    EncodedObjectBuilder builder = null;
+    if (EvaluationHelper.equals(encodingMask.getXmlBody(), (boolean) false)
+        && EvaluationHelper.equals(encodingMask.getBinaryBody(), (boolean) true)) {
+      builder =
+          BinaryWireExtensionObject.staticParseEncodedObjectBuilder(
+              readBuffer, extensionId, encodingMask);
+    } else if (EvaluationHelper.equals(encodingMask.getXmlBody(), (boolean) false)
+        && EvaluationHelper.equals(encodingMask.getBinaryBody(), (boolean) false)) {
+      builder =
+          NullExtensionObject.staticParseEncodedObjectBuilder(
+              readBuffer, extensionId, encodingMask);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "encodingMaskxmlBody="
+              + encodingMask.getXmlBody()
+              + " "
+              + "encodingMaskbinaryBody="
+              + encodingMask.getBinaryBody()
+              + "]");
+    }
+
+    readBuffer.closeContext("EncodedObject");
+    // Create the instance
+    EncodedObject _encodedObject = builder.build();
+    return _encodedObject;
+  }
+
+  public interface EncodedObjectBuilder {
+    EncodedObject build();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof EncodedObject)) {
+      return false;
+    }
+    EncodedObject that = (EncodedObject) o;
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash();
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java
index 9629430cba5..4c8717fb930 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java
@@ -38,8 +38,8 @@
 public class EndpointConfiguration extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "333";
+  public Integer getExtensionId() {
+    return (int) 333;
   }
 
   // Properties.
@@ -197,7 +197,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EndpointConfiguration");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointDescription.java
index 1b28d68e837..1e9cde1ae96 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointDescription.java
@@ -38,8 +38,8 @@
 public class EndpointDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "314";
+  public Integer getExtensionId() {
+    return (int) 314;
   }
 
   // Properties.
@@ -203,7 +203,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EndpointDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -219,7 +219,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ApplicationDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("310")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (310)),
                 readBuffer));
 
     PascalByteString serverCertificate =
@@ -249,7 +249,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (UserTokenPolicy)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("306")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (306)),
                 readBuffer),
             noOfUserIdentityTokens);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointType.java
index 203a00636f5..17b78ede9f9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointType.java
@@ -38,8 +38,8 @@
 public class EndpointType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15530";
+  public Integer getExtensionId() {
+    return (int) 15530;
   }
 
   // Properties.
@@ -134,7 +134,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EndpointType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointUrlListDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointUrlListDataType.java
index 7462ce84b80..b63350c8a1d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointUrlListDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointUrlListDataType.java
@@ -38,8 +38,8 @@
 public class EndpointUrlListDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "11945";
+  public Integer getExtensionId() {
+    return (int) 11945;
   }
 
   // Properties.
@@ -100,7 +100,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EndpointUrlListDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDefinition.java
index c0a368f9022..4c93518b917 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDefinition.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDefinition.java
@@ -38,8 +38,8 @@
 public class EnumDefinition extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "102";
+  public Integer getExtensionId() {
+    return (int) 102;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EnumDefinition");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -110,8 +110,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "fields",
             new DataReaderComplexDefault<>(
-                () ->
-                    (EnumField) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("104")),
+                () -> (EnumField) ExtensionObjectDefinition.staticParse(readBuffer, (int) (104)),
                 readBuffer),
             noOfFields);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDescription.java
index 7e45febcfe7..f3ff5dd58d4 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumDescription.java
@@ -38,8 +38,8 @@
 public class EnumDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15490";
+  public Integer getExtensionId() {
+    return (int) 15490;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EnumDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -143,8 +143,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "enumDefinition",
             new DataReaderComplexDefault<>(
                 () ->
-                    (EnumDefinition)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("102")),
+                    (EnumDefinition) ExtensionObjectDefinition.staticParse(readBuffer, (int) (102)),
                 readBuffer));
 
     short builtInType = readSimpleField("builtInType", readUnsignedShort(readBuffer, 8));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumField.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumField.java
index ac6f6de5b26..c210d56344b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumField.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumField.java
@@ -38,8 +38,8 @@
 public class EnumField extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "104";
+  public Integer getExtensionId() {
+    return (int) 104;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EnumField");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumValueType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumValueType.java
index 0d80520d605..f486a4810b7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumValueType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EnumValueType.java
@@ -38,8 +38,8 @@
 public class EnumValueType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "7596";
+  public Integer getExtensionId() {
+    return (int) 7596;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EnumValueType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EphemeralKeyType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EphemeralKeyType.java
index 630b35d6eff..9814c755c03 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EphemeralKeyType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EphemeralKeyType.java
@@ -38,8 +38,8 @@
 public class EphemeralKeyType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "17550";
+  public Integer getExtensionId() {
+    return (int) 17550;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EphemeralKeyType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFieldList.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFieldList.java
index 7e9468b4ba3..ecb97d85977 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFieldList.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFieldList.java
@@ -38,8 +38,8 @@
 public class EventFieldList extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "919";
+  public Integer getExtensionId() {
+    return (int) 919;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EventFieldList");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilter.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilter.java
index e5939306de5..ddb5ed88705 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilter.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilter.java
@@ -38,8 +38,8 @@
 public class EventFilter extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "727";
+  public Integer getExtensionId() {
+    return (int) 727;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EventFilter");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -125,7 +125,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SimpleAttributeOperand)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("603")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (603)),
                 readBuffer),
             noOfSelectClauses);
 
@@ -134,8 +134,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "whereClause",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ContentFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("588")),
+                    (ContentFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (588)),
                 readBuffer));
 
     readBuffer.closeContext("EventFilter");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilterResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilterResult.java
index 01caaa7f6bc..5f267fe7dff 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilterResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventFilterResult.java
@@ -38,8 +38,8 @@
 public class EventFilterResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "736";
+  public Integer getExtensionId() {
+    return (int) 736;
   }
 
   // Properties.
@@ -151,7 +151,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EventFilterResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -181,7 +181,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ContentFilterResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("609")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (609)),
                 readBuffer));
 
     readBuffer.closeContext("EventFilterResult");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventNotificationList.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventNotificationList.java
index 9f71de8f3ea..92b4836e776 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventNotificationList.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EventNotificationList.java
@@ -38,8 +38,8 @@
 public class EventNotificationList extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "916";
+  public Integer getExtensionId() {
+    return (int) 916;
   }
 
   // Properties.
@@ -61,11 +61,6 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer)
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext("EventNotificationList");
 
-    // Implicit Field (size) (Used for parsing, but its value is not stored as it's implicitly given
-    // by the objects content)
-    int size = (int) ((getLengthInBytes()) - (4));
-    writeImplicitField("size", size, writeSignedInt(writeBuffer, 32));
-
     // Implicit Field (noOfEvents) (Used for parsing, but its value is not stored as it's implicitly
     // given by the objects content)
     int noOfEvents = (int) ((((getEvents()) == (null)) ? -(1) : COUNT(getEvents())));
@@ -88,9 +83,6 @@ public int getLengthInBits() {
     EventNotificationList _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    // Implicit Field (size)
-    lengthInBits += 32;
-
     // Implicit Field (noOfEvents)
     lengthInBits += 32;
 
@@ -107,13 +99,11 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("EventNotificationList");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    int size = readImplicitField("size", readSignedInt(readBuffer, 32));
-
     int noOfEvents = readImplicitField("noOfEvents", readSignedInt(readBuffer, 32));
 
     List<EventFieldList> events =
@@ -121,8 +111,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "events",
             new DataReaderComplexDefault<>(
                 () ->
-                    (EventFieldList)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("919")),
+                    (EventFieldList) ExtensionObjectDefinition.staticParse(readBuffer, (int) (919)),
                 readBuffer),
             noOfEvents);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensiblePayload.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensiblePayload.java
index 6254cea48eb..0d3e499d3dd 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensiblePayload.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensiblePayload.java
@@ -43,14 +43,14 @@ public Boolean getExtensible() {
   }
 
   // Properties.
-  protected final ExtensionObject payload;
+  protected final RootExtensionObject payload;
 
-  public ExtensiblePayload(SequenceHeader sequenceHeader, ExtensionObject payload) {
+  public ExtensiblePayload(SequenceHeader sequenceHeader, RootExtensionObject payload) {
     super(sequenceHeader);
     this.payload = payload;
   }
 
-  public ExtensionObject getPayload() {
+  public RootExtensionObject getPayload() {
     return payload;
   }
 
@@ -89,11 +89,11 @@ public static PayloadBuilder staticParsePayloadBuilder(
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    ExtensionObject payload =
+    RootExtensionObject payload =
         readSimpleField(
             "payload",
             new DataReaderComplexDefault<>(
-                () -> ExtensionObject.staticParse(readBuffer, (boolean) (false)), readBuffer));
+                () -> (RootExtensionObject) ExtensionObject.staticParse(readBuffer), readBuffer));
 
     readBuffer.closeContext("ExtensiblePayload");
     // Create the instance
@@ -101,9 +101,9 @@ public static PayloadBuilder staticParsePayloadBuilder(
   }
 
   public static class ExtensiblePayloadBuilderImpl implements Payload.PayloadBuilder {
-    private final ExtensionObject payload;
+    private final RootExtensionObject payload;
 
-    public ExtensiblePayloadBuilderImpl(ExtensionObject payload) {
+    public ExtensiblePayloadBuilderImpl(RootExtensionObject payload) {
       this.payload = payload;
     }
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObject.java
index 3e786f2b1f5..ccd38d1f827 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObject.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObject.java
@@ -35,38 +35,34 @@
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class ExtensionObject implements Message {
+public abstract class ExtensionObject implements Message {
+
+  // Abstract accessors for discriminator values.
+  public abstract Boolean getIncludeEncodingMask();
 
   // Properties.
   protected final ExpandedNodeId typeId;
-  protected final ExtensionObjectEncodingMask encodingMask;
-  protected final ExtensionObjectDefinition body;
 
-  public ExtensionObject(
-      ExpandedNodeId typeId,
-      ExtensionObjectEncodingMask encodingMask,
-      ExtensionObjectDefinition body) {
+  public ExtensionObject(ExpandedNodeId typeId) {
     super();
     this.typeId = typeId;
-    this.encodingMask = encodingMask;
-    this.body = body;
   }
 
+  public abstract ExtensionObjectDefinition getBody();
+
   public ExpandedNodeId getTypeId() {
     return typeId;
   }
 
-  public ExtensionObjectEncodingMask getEncodingMask() {
-    return encodingMask;
+  public int getExtensionId() {
+    return (int)
+        ((((getTypeId()) == (null))
+            ? 0
+            : org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.extensionId(getTypeId())));
   }
 
-  public ExtensionObjectDefinition getBody() {
-    return body;
-  }
-
-  public String getIdentifier() {
-    return String.valueOf(getTypeId().getIdentifier());
-  }
+  protected abstract void serializeExtensionObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException;
 
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
@@ -76,15 +72,12 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     // Simple Field (typeId)
     writeSimpleField("typeId", typeId, new DataWriterComplexDefault<>(writeBuffer));
 
-    // Optional Field (encodingMask) (Can be skipped, if the value is null)
-    writeOptionalField("encodingMask", encodingMask, new DataWriterComplexDefault<>(writeBuffer));
-
     // Virtual field (doesn't actually serialize anything, just makes the value available)
-    String identifier = getIdentifier();
-    writeBuffer.writeVirtual("identifier", identifier);
+    int extensionId = getExtensionId();
+    writeBuffer.writeVirtual("extensionId", extensionId);
 
-    // Simple Field (body)
-    writeSimpleField("body", body, new DataWriterComplexDefault<>(writeBuffer));
+    // Switch field (Serialize the sub-type)
+    serializeExtensionObjectChild(writeBuffer);
 
     writeBuffer.popContext("ExtensionObject");
   }
@@ -103,15 +96,9 @@ public int getLengthInBits() {
     // Simple field (typeId)
     lengthInBits += typeId.getLengthInBits();
 
-    // Optional Field (encodingMask)
-    if (encodingMask != null) {
-      lengthInBits += encodingMask.getLengthInBits();
-    }
-
     // A virtual field doesn't have any in- or output.
 
-    // Simple field (body)
-    lengthInBits += body.getLengthInBits();
+    // Length of sub-type elements will be added by sub-type...
 
     return lengthInBits;
   }
@@ -147,29 +134,44 @@ public static ExtensionObject staticParse(ReadBuffer readBuffer, Boolean include
             "typeId",
             new DataReaderComplexDefault<>(
                 () -> ExpandedNodeId.staticParse(readBuffer), readBuffer));
-
-    ExtensionObjectEncodingMask encodingMask =
-        readOptionalField(
-            "encodingMask",
-            new DataReaderComplexDefault<>(
-                () -> ExtensionObjectEncodingMask.staticParse(readBuffer), readBuffer),
-            includeEncodingMask);
-    String identifier = readVirtualField("identifier", String.class, typeId.getIdentifier());
-
-    ExtensionObjectDefinition body =
-        readSimpleField(
-            "body",
-            new DataReaderComplexDefault<>(
-                () -> ExtensionObjectDefinition.staticParse(readBuffer, (String) (identifier)),
-                readBuffer));
+    int extensionId =
+        readVirtualField(
+            "extensionId",
+            int.class,
+            (((typeId) == (null))
+                ? 0
+                : org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.extensionId(typeId)));
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    ExtensionObjectBuilder builder = null;
+    if (EvaluationHelper.equals(includeEncodingMask, (boolean) false)) {
+      builder =
+          RootExtensionObject.staticParseExtensionObjectBuilder(
+              readBuffer, extensionId, includeEncodingMask);
+    } else if (EvaluationHelper.equals(includeEncodingMask, (boolean) true)) {
+      builder =
+          ExtensionObjectWithMask.staticParseExtensionObjectBuilder(
+              readBuffer, extensionId, includeEncodingMask);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "includeEncodingMask="
+              + includeEncodingMask
+              + "]");
+    }
 
     readBuffer.closeContext("ExtensionObject");
     // Create the instance
-    ExtensionObject _extensionObject;
-    _extensionObject = new ExtensionObject(typeId, encodingMask, body);
+    ExtensionObject _extensionObject = builder.build(typeId);
     return _extensionObject;
   }
 
+  public interface ExtensionObjectBuilder {
+    ExtensionObject build(ExpandedNodeId typeId);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -179,15 +181,12 @@ public boolean equals(Object o) {
       return false;
     }
     ExtensionObject that = (ExtensionObject) o;
-    return (getTypeId() == that.getTypeId())
-        && (getEncodingMask() == that.getEncodingMask())
-        && (getBody() == that.getBody())
-        && true;
+    return (getTypeId() == that.getTypeId()) && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getTypeId(), getEncodingMask(), getBody());
+    return Objects.hash(getTypeId());
   }
 
   @Override
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectDefinition.java
index 50c2c5af999..d13f97b6239 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectDefinition.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectDefinition.java
@@ -38,7 +38,7 @@
 public abstract class ExtensionObjectDefinition implements Message {
 
   // Abstract accessors for discriminator values.
-  public abstract String getExtensionId();
+  public abstract Integer getExtensionId();
 
   public ExtensionObjectDefinition() {
     super();
@@ -81,20 +81,20 @@ public static ExtensionObjectDefinition staticParse(ReadBuffer readBuffer, Objec
       throw new PlcRuntimeException(
           "Wrong number of arguments, expected 1, but got " + args.length);
     }
-    String extensionId;
-    if (args[0] instanceof String) {
-      extensionId = (String) args[0];
+    Integer extensionId;
+    if (args[0] instanceof Integer) {
+      extensionId = (Integer) args[0];
     } else if (args[0] instanceof String) {
-      extensionId = String.valueOf((String) args[0]);
+      extensionId = Integer.valueOf((String) args[0]);
     } else {
       throw new PlcRuntimeException(
-          "Argument 0 expected to be of type String or a string which is parseable but was "
+          "Argument 0 expected to be of type Integer or a string which is parseable but was "
               + args[0].getClass().getName());
     }
     return staticParse(readBuffer, extensionId);
   }
 
-  public static ExtensionObjectDefinition staticParse(ReadBuffer readBuffer, String extensionId)
+  public static ExtensionObjectDefinition staticParse(ReadBuffer readBuffer, Integer extensionId)
       throws ParseException {
     readBuffer.pullContext("ExtensionObjectDefinition");
     PositionAware positionAware = readBuffer;
@@ -102,1011 +102,1011 @@ public static ExtensionObjectDefinition staticParse(ReadBuffer readBuffer, Strin
 
     // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
     ExtensionObjectDefinitionBuilder builder = null;
-    if (EvaluationHelper.equals(extensionId, (String) "0")) {
+    if (EvaluationHelper.equals(extensionId, (int) 0)) {
       builder = NullExtension.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12758")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12758)) {
       builder = Union.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14535")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14535)) {
       builder = KeyValuePair.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "16315")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 16315)) {
       builder =
           AdditionalParametersType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "17550")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 17550)) {
       builder =
           EphemeralKeyType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15530")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15530)) {
       builder = EndpointType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32423")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32423)) {
       builder =
           BitFieldDefinition.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "18808")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 18808)) {
       builder = RationalNumber.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "18809")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 18809)) {
       builder = OpcuaVector.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "18811")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 18811)) {
       builder =
           CartesianCoordinates.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "18813")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 18813)) {
       builder = Orientation.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "18815")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 18815)) {
       builder = Frame.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15636")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15636)) {
       builder =
           IdentityMappingRuleType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23500")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23500)) {
       builder =
           CurrencyUnitType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32436")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32436)) {
       builder =
           AnnotationDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32437")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32437)) {
       builder =
           LinearConversionDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32440")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32440)) {
       builder =
           QuantityDimension.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12556")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12556)) {
       builder =
           TrustListDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32287")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32287)) {
       builder =
           TransactionErrorType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15536")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15536)) {
       builder =
           DataTypeSchemaHeader.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14527")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14527)) {
       builder =
           DataTypeDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15489")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15489)) {
       builder =
           StructureDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15490")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15490)) {
       builder =
           EnumDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15007")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15007)) {
       builder =
           SimpleTypeDescription.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15008")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15008)) {
       builder =
           UABinaryFileDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "24107")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 24107)) {
       builder =
           PortableQualifiedName.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "24108")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 24108)) {
       builder = PortableNodeId.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "24109")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 24109)) {
       builder =
           UnsignedRationalNumber.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14525")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14525)) {
       builder =
           DataSetMetaDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14526")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14526)) {
       builder = FieldMetaData.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14595")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14595)) {
       builder =
           ConfigurationVersionDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15580")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15580)) {
       builder =
           PublishedDataSetDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15582")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15582)) {
       builder =
           PublishedDataSetSourceDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14275")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14275)) {
       builder =
           PublishedVariableDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15583")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15583)) {
       builder =
           PublishedDataItemsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15584")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15584)) {
       builder =
           PublishedEventsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "25271")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 25271)) {
       builder =
           PublishedDataSetCustomSourceDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15599")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15599)) {
       builder =
           DataSetWriterDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15600")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15600)) {
       builder =
           DataSetWriterTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15607")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15607)) {
       builder =
           DataSetWriterMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15611")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15611)) {
       builder =
           PubSubGroupDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15482")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15482)) {
       builder =
           WriterGroupDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15613")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15613)) {
       builder =
           WriterGroupTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15618")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15618)) {
       builder =
           WriterGroupMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15619")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15619)) {
       builder =
           PubSubConnectionDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15620")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15620)) {
       builder =
           ConnectionTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15504")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15504)) {
       builder =
           NetworkAddressDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15512")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15512)) {
       builder =
           NetworkAddressUrlDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15522")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15522)) {
       builder =
           ReaderGroupDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15623")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15623)) {
       builder =
           ReaderGroupTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15624")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15624)) {
       builder =
           ReaderGroupMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15625")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15625)) {
       builder =
           DataSetReaderDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15630")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15630)) {
       builder =
           DataSetReaderTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15631")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15631)) {
       builder =
           DataSetReaderMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15632")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15632)) {
       builder =
           SubscribedDataSetDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15633")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15633)) {
       builder =
           TargetVariablesDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "14746")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 14746)) {
       builder =
           FieldTargetDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15637")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15637)) {
       builder =
           SubscribedDataSetMirrorDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15532")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15532)) {
       builder =
           PubSubConfigurationDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23601")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23601)) {
       builder =
           StandaloneSubscribedDataSetRefDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23602")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23602)) {
       builder =
           StandaloneSubscribedDataSetDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23603")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23603)) {
       builder =
           SecurityGroupDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "25272")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 25272)) {
       builder =
           PubSubKeyPushTargetDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23604")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23604)) {
       builder =
           PubSubConfiguration2DataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15647")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15647)) {
       builder =
           UadpWriterGroupMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15654")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15654)) {
       builder =
           UadpDataSetWriterMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15655")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15655)) {
       builder =
           UadpDataSetReaderMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15659")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15659)) {
       builder =
           JsonWriterGroupMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15666")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15666)) {
       builder =
           JsonDataSetWriterMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15667")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15667)) {
       builder =
           JsonDataSetReaderMessageDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23605")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23605)) {
       builder = QosDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23606")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23606)) {
       builder =
           TransmitQosDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23607")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23607)) {
       builder =
           TransmitQosPriorityDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23610")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23610)) {
       builder =
           ReceiveQosDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23611")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23611)) {
       builder =
           ReceiveQosPriorityDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "17469")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 17469)) {
       builder =
           DatagramConnectionTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23614")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23614)) {
       builder =
           DatagramConnectionTransport2DataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15534")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15534)) {
       builder =
           DatagramWriterGroupTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23615")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23615)) {
       builder =
           DatagramWriterGroupTransport2DataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23616")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23616)) {
       builder =
           DatagramDataSetReaderTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15009")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15009)) {
       builder =
           BrokerConnectionTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15669")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15669)) {
       builder =
           BrokerWriterGroupTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15671")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15671)) {
       builder =
           BrokerDataSetWriterTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15672")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15672)) {
       builder =
           BrokerDataSetReaderTransportDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "25521")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 25521)) {
       builder =
           PubSubConfigurationRefDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "25522")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 25522)) {
       builder =
           PubSubConfigurationValueDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23470")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23470)) {
       builder =
           AliasNameDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "24283")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 24283)) {
       builder =
           UserManagementDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "25222")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 25222)) {
       builder =
           PriorityMappingEntryType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32661")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32661)) {
       builder =
           ReferenceDescriptionDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32662")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32662)) {
       builder =
           ReferenceListEntryDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "98")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 98)) {
       builder =
           RolePermissionType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "99")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 99)) {
       builder =
           DataTypeDefinition.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "103")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 103)) {
       builder = StructureField.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "101")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 101)) {
       builder =
           StructureDefinition.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "102")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 102)) {
       builder = EnumDefinition.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "298")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 298)) {
       builder = Argument.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "7596")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 7596)) {
       builder = EnumValueType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "104")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 104)) {
       builder = EnumField.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12757")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12757)) {
       builder = OptionSet.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "8914")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 8914)) {
       builder =
           TimeZoneDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "310")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 310)) {
       builder =
           ApplicationDescription.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "391")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 391)) {
       builder = RequestHeader.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "394")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 394)) {
       builder = ResponseHeader.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "397")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 397)) {
       builder = ServiceFault.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "15903")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 15903)) {
       builder =
           SessionlessInvokeRequestType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "21001")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 21001)) {
       builder =
           SessionlessInvokeResponseType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "422")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 422)) {
       builder =
           FindServersRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "425")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 425)) {
       builder =
           FindServersResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12191")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12191)) {
       builder =
           ServerOnNetwork.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12192")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12192)) {
       builder =
           FindServersOnNetworkRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12193")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12193)) {
       builder =
           FindServersOnNetworkResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "306")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 306)) {
       builder =
           UserTokenPolicy.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "314")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 314)) {
       builder =
           EndpointDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "428")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 428)) {
       builder =
           GetEndpointsRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "431")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 431)) {
       builder =
           GetEndpointsResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "434")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 434)) {
       builder =
           RegisteredServer.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "437")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 437)) {
       builder =
           RegisterServerRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "440")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 440)) {
       builder =
           RegisterServerResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12892")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12892)) {
       builder =
           DiscoveryConfiguration.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12893")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12893)) {
       builder =
           MdnsDiscoveryConfiguration.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12195")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12195)) {
       builder =
           RegisterServer2Request.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12196")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12196)) {
       builder =
           RegisterServer2Response.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "443")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 443)) {
       builder =
           ChannelSecurityToken.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "446")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 446)) {
       builder =
           OpenSecureChannelRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "449")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 449)) {
       builder =
           OpenSecureChannelResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "452")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 452)) {
       builder =
           CloseSecureChannelRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "455")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 455)) {
       builder =
           CloseSecureChannelResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "346")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 346)) {
       builder =
           SignedSoftwareCertificate.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "458")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 458)) {
       builder = SignatureData.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "461")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 461)) {
       builder =
           CreateSessionRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "464")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 464)) {
       builder =
           CreateSessionResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "318")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 318)) {
       builder =
           UserIdentityToken.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "467")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 467)) {
       builder =
           ActivateSessionRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "470")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 470)) {
       builder =
           ActivateSessionResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "473")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 473)) {
       builder =
           CloseSessionRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "476")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 476)) {
       builder =
           CloseSessionResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "479")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 479)) {
       builder = CancelRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "482")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 482)) {
       builder = CancelResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "351")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 351)) {
       builder = NodeAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "354")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 354)) {
       builder =
           ObjectAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "357")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 357)) {
       builder =
           VariableAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "360")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 360)) {
       builder =
           MethodAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "363")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 363)) {
       builder =
           ObjectTypeAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "366")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 366)) {
       builder =
           VariableTypeAttributes.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "369")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 369)) {
       builder =
           ReferenceTypeAttributes.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "372")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 372)) {
       builder =
           DataTypeAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "375")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 375)) {
       builder = ViewAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "17608")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 17608)) {
       builder =
           GenericAttributeValue.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "17609")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 17609)) {
       builder =
           GenericAttributes.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "378")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 378)) {
       builder = AddNodesItem.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "485")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 485)) {
       builder = AddNodesResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "488")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 488)) {
       builder =
           AddNodesRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "491")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 491)) {
       builder =
           AddNodesResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "381")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 381)) {
       builder =
           AddReferencesItem.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "494")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 494)) {
       builder =
           AddReferencesRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "497")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 497)) {
       builder =
           AddReferencesResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "384")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 384)) {
       builder =
           DeleteNodesItem.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "500")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 500)) {
       builder =
           DeleteNodesRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "503")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 503)) {
       builder =
           DeleteNodesResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "387")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 387)) {
       builder =
           DeleteReferencesItem.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "506")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 506)) {
       builder =
           DeleteReferencesRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "509")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 509)) {
       builder =
           DeleteReferencesResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "513")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 513)) {
       builder =
           ViewDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "516")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 516)) {
       builder =
           BrowseDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "520")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 520)) {
       builder =
           ReferenceDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "524")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 524)) {
       builder = BrowseResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "527")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 527)) {
       builder = BrowseRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "530")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 530)) {
       builder = BrowseResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "533")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 533)) {
       builder =
           BrowseNextRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "536")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 536)) {
       builder =
           BrowseNextResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "539")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 539)) {
       builder =
           RelativePathElement.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "542")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 542)) {
       builder = RelativePath.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "545")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 545)) {
       builder = BrowsePath.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "548")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 548)) {
       builder =
           BrowsePathTarget.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "551")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 551)) {
       builder =
           BrowsePathResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "554")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 554)) {
       builder =
           TranslateBrowsePathsToNodeIdsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "557")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 557)) {
       builder =
           TranslateBrowsePathsToNodeIdsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "560")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 560)) {
       builder =
           RegisterNodesRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "563")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 563)) {
       builder =
           RegisterNodesResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "566")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 566)) {
       builder =
           UnregisterNodesRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "569")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 569)) {
       builder =
           UnregisterNodesResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "333")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 333)) {
       builder =
           EndpointConfiguration.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "572")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 572)) {
       builder =
           QueryDataDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "575")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 575)) {
       builder =
           NodeTypeDescription.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "579")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 579)) {
       builder = QueryDataSet.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "582")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 582)) {
       builder = NodeReference.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "585")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 585)) {
       builder =
           ContentFilterElement.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "588")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 588)) {
       builder = ContentFilter.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "591")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 591)) {
       builder = FilterOperand.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "594")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 594)) {
       builder = ElementOperand.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "597")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 597)) {
       builder = LiteralOperand.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "600")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 600)) {
       builder =
           AttributeOperand.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "603")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 603)) {
       builder =
           SimpleAttributeOperand.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "606")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 606)) {
       builder =
           ContentFilterElementResult.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "609")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 609)) {
       builder =
           ContentFilterResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "612")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 612)) {
       builder = ParsingResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "615")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 615)) {
       builder =
           QueryFirstRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "618")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 618)) {
       builder =
           QueryFirstResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "621")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 621)) {
       builder =
           QueryNextRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "624")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 624)) {
       builder =
           QueryNextResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "628")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 628)) {
       builder = ReadValueId.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "631")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 631)) {
       builder = ReadRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "634")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 634)) {
       builder = ReadResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "637")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 637)) {
       builder =
           HistoryReadValueId.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "640")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 640)) {
       builder =
           HistoryReadResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "643")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 643)) {
       builder =
           HistoryReadDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "646")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 646)) {
       builder =
           ReadEventDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32801")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32801)) {
       builder =
           ReadEventDetails2.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "649")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 649)) {
       builder =
           ReadRawModifiedDetails.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "652")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 652)) {
       builder =
           ReadProcessedDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "655")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 655)) {
       builder =
           ReadAtTimeDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "23499")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 23499)) {
       builder =
           ReadAnnotationDataDetails.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "658")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 658)) {
       builder = HistoryData.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "11218")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 11218)) {
       builder =
           ModificationInfo.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "11219")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 11219)) {
       builder =
           HistoryModifiedData.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "661")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 661)) {
       builder = HistoryEvent.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "32826")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 32826)) {
       builder =
           HistoryModifiedEvent.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "664")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 664)) {
       builder =
           HistoryReadRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "667")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 667)) {
       builder =
           HistoryReadResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "670")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 670)) {
       builder = WriteValue.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "673")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 673)) {
       builder = WriteRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "676")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 676)) {
       builder = WriteResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "679")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 679)) {
       builder =
           HistoryUpdateDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "682")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 682)) {
       builder =
           UpdateDataDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "11297")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 11297)) {
       builder =
           UpdateStructureDataDetails.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "685")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 685)) {
       builder =
           UpdateEventDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "688")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 688)) {
       builder =
           DeleteRawModifiedDetails.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "691")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 691)) {
       builder =
           DeleteAtTimeDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "694")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 694)) {
       builder =
           DeleteEventDetails.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "697")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 697)) {
       builder =
           HistoryUpdateResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "700")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 700)) {
       builder =
           HistoryUpdateRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "703")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 703)) {
       builder =
           HistoryUpdateResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "706")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 706)) {
       builder =
           CallMethodRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "709")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 709)) {
       builder =
           CallMethodResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "712")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 712)) {
       builder = CallRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "715")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 715)) {
       builder = CallResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "721")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 721)) {
       builder =
           MonitoringFilter.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "724")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 724)) {
       builder =
           DataChangeFilter.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "727")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 727)) {
       builder = EventFilter.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "950")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 950)) {
       builder =
           AggregateConfiguration.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "730")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 730)) {
       builder =
           AggregateFilter.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "733")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 733)) {
       builder =
           MonitoringFilterResult.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "736")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 736)) {
       builder =
           EventFilterResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "739")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 739)) {
       builder =
           AggregateFilterResult.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "742")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 742)) {
       builder =
           MonitoringParameters.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "745")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 745)) {
       builder =
           MonitoredItemCreateRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "748")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 748)) {
       builder =
           MonitoredItemCreateResult.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "751")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 751)) {
       builder =
           CreateMonitoredItemsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "754")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 754)) {
       builder =
           CreateMonitoredItemsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "757")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 757)) {
       builder =
           MonitoredItemModifyRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "760")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 760)) {
       builder =
           MonitoredItemModifyResult.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "763")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 763)) {
       builder =
           ModifyMonitoredItemsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "766")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 766)) {
       builder =
           ModifyMonitoredItemsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "769")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 769)) {
       builder =
           SetMonitoringModeRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "772")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 772)) {
       builder =
           SetMonitoringModeResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "775")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 775)) {
       builder =
           SetTriggeringRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "778")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 778)) {
       builder =
           SetTriggeringResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "781")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 781)) {
       builder =
           DeleteMonitoredItemsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "784")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 784)) {
       builder =
           DeleteMonitoredItemsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "787")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 787)) {
       builder =
           CreateSubscriptionRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "790")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 790)) {
       builder =
           CreateSubscriptionResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "793")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 793)) {
       builder =
           ModifySubscriptionRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "796")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 796)) {
       builder =
           ModifySubscriptionResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "799")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 799)) {
       builder =
           SetPublishingModeRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "802")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 802)) {
       builder =
           SetPublishingModeResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "805")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 805)) {
       builder =
           NotificationMessage.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "947")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 947)) {
       builder =
           NotificationData.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "811")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 811)) {
       builder =
           DataChangeNotification.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "808")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 808)) {
       builder =
           MonitoredItemNotification.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "916")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 916)) {
       builder =
           EventNotificationList.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "919")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 919)) {
       builder = EventFieldList.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "922")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 922)) {
       builder =
           HistoryEventFieldList.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "820")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 820)) {
       builder =
           StatusChangeNotification.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "823")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 823)) {
       builder =
           SubscriptionAcknowledgement.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "826")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 826)) {
       builder = PublishRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "829")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 829)) {
       builder =
           PublishResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "832")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 832)) {
       builder =
           RepublishRequest.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "835")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 835)) {
       builder =
           RepublishResponse.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "838")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 838)) {
       builder = TransferResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "841")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 841)) {
       builder =
           TransferSubscriptionsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "844")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 844)) {
       builder =
           TransferSubscriptionsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "847")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 847)) {
       builder =
           DeleteSubscriptionsRequest.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "850")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 850)) {
       builder =
           DeleteSubscriptionsResponse.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "340")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 340)) {
       builder = BuildInfo.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "855")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 855)) {
       builder =
           RedundantServerDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "11945")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 11945)) {
       builder =
           EndpointUrlListDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "11946")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 11946)) {
       builder =
           NetworkGroupDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "858")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 858)) {
       builder =
           SamplingIntervalDiagnosticsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "861")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 861)) {
       builder =
           ServerDiagnosticsSummaryDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "864")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 864)) {
       builder =
           ServerStatusDataType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "867")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 867)) {
       builder =
           SessionDiagnosticsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "870")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 870)) {
       builder =
           SessionSecurityDiagnosticsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "873")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 873)) {
       builder =
           ServiceCounterDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "301")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 301)) {
       builder = StatusResult.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "876")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 876)) {
       builder =
           SubscriptionDiagnosticsDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "879")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 879)) {
       builder =
           ModelChangeStructureDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "899")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 899)) {
       builder =
           SemanticChangeStructureDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "886")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 886)) {
       builder = Range.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "889")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 889)) {
       builder = EUInformation.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12173")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12173)) {
       builder =
           ComplexNumberType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12174")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12174)) {
       builder =
           DoubleComplexNumberType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12081")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12081)) {
       builder =
           AxisInformation.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "12082")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 12082)) {
       builder = XVType.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "896")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 896)) {
       builder =
           ProgramDiagnosticDataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "24035")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 24035)) {
       builder =
           ProgramDiagnostic2DataType.staticParseExtensionObjectDefinitionBuilder(
               readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "893")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 893)) {
       builder = Annotation.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
-    } else if (EvaluationHelper.equals(extensionId, (String) "316")) {
+    } else if (EvaluationHelper.equals(extensionId, (int) 316)) {
       builder =
           UserIdentityToken.staticParseExtensionObjectDefinitionBuilder(readBuffer, extensionId);
     }
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectEncodingMask.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectEncodingMask.java
index 789ae9a5d83..68c7082f7d6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectEncodingMask.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectEncodingMask.java
@@ -39,13 +39,13 @@ public class ExtensionObjectEncodingMask implements Message {
 
   // Properties.
   protected final boolean typeIdSpecified;
-  protected final boolean xmlbody;
+  protected final boolean xmlBody;
   protected final boolean binaryBody;
 
-  public ExtensionObjectEncodingMask(boolean typeIdSpecified, boolean xmlbody, boolean binaryBody) {
+  public ExtensionObjectEncodingMask(boolean typeIdSpecified, boolean xmlBody, boolean binaryBody) {
     super();
     this.typeIdSpecified = typeIdSpecified;
-    this.xmlbody = xmlbody;
+    this.xmlBody = xmlBody;
     this.binaryBody = binaryBody;
   }
 
@@ -53,8 +53,8 @@ public boolean getTypeIdSpecified() {
     return typeIdSpecified;
   }
 
-  public boolean getXmlbody() {
-    return xmlbody;
+  public boolean getXmlBody() {
+    return xmlBody;
   }
 
   public boolean getBinaryBody() {
@@ -72,8 +72,8 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     // Simple Field (typeIdSpecified)
     writeSimpleField("typeIdSpecified", typeIdSpecified, writeBoolean(writeBuffer));
 
-    // Simple Field (xmlbody)
-    writeSimpleField("xmlbody", xmlbody, writeBoolean(writeBuffer));
+    // Simple Field (xmlBody)
+    writeSimpleField("xmlBody", xmlBody, writeBoolean(writeBuffer));
 
     // Simple Field (binaryBody)
     writeSimpleField("binaryBody", binaryBody, writeBoolean(writeBuffer));
@@ -98,7 +98,7 @@ public int getLengthInBits() {
     // Simple field (typeIdSpecified)
     lengthInBits += 1;
 
-    // Simple field (xmlbody)
+    // Simple field (xmlBody)
     lengthInBits += 1;
 
     // Simple field (binaryBody)
@@ -123,7 +123,7 @@ public static ExtensionObjectEncodingMask staticParse(ReadBuffer readBuffer)
 
     boolean typeIdSpecified = readSimpleField("typeIdSpecified", readBoolean(readBuffer));
 
-    boolean xmlbody = readSimpleField("xmlbody", readBoolean(readBuffer));
+    boolean xmlBody = readSimpleField("xmlBody", readBoolean(readBuffer));
 
     boolean binaryBody = readSimpleField("binaryBody", readBoolean(readBuffer));
 
@@ -131,7 +131,7 @@ public static ExtensionObjectEncodingMask staticParse(ReadBuffer readBuffer)
     // Create the instance
     ExtensionObjectEncodingMask _extensionObjectEncodingMask;
     _extensionObjectEncodingMask =
-        new ExtensionObjectEncodingMask(typeIdSpecified, xmlbody, binaryBody);
+        new ExtensionObjectEncodingMask(typeIdSpecified, xmlBody, binaryBody);
     return _extensionObjectEncodingMask;
   }
 
@@ -145,14 +145,14 @@ public boolean equals(Object o) {
     }
     ExtensionObjectEncodingMask that = (ExtensionObjectEncodingMask) o;
     return (getTypeIdSpecified() == that.getTypeIdSpecified())
-        && (getXmlbody() == that.getXmlbody())
+        && (getXmlBody() == that.getXmlBody())
         && (getBinaryBody() == that.getBinaryBody())
         && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getTypeIdSpecified(), getXmlbody(), getBinaryBody());
+    return Objects.hash(getTypeIdSpecified(), getXmlBody(), getBinaryBody());
   }
 
   @Override
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectWithMask.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectWithMask.java
new file mode 100644
index 00000000000..663fdbd6213
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectWithMask.java
@@ -0,0 +1,190 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public abstract class ExtensionObjectWithMask extends ExtensionObject implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getIncludeEncodingMask() {
+    return (boolean) true;
+  }
+
+  // Abstract accessors for discriminator values.
+  public abstract Boolean getEncodingMaskBinaryBody();
+
+  public abstract Boolean getEncodingMaskXmlBody();
+
+  // Properties.
+  protected final ExtensionObjectEncodingMask encodingMask;
+
+  public ExtensionObjectWithMask(ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask) {
+    super(typeId);
+    this.encodingMask = encodingMask;
+  }
+
+  public ExtensionObjectEncodingMask getEncodingMask() {
+    return encodingMask;
+  }
+
+  protected abstract void serializeExtensionObjectWithMaskChild(WriteBuffer writeBuffer)
+      throws SerializationException;
+
+  @Override
+  protected void serializeExtensionObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("ExtensionObjectWithMask");
+
+    // Simple Field (encodingMask)
+    writeSimpleField("encodingMask", encodingMask, new DataWriterComplexDefault<>(writeBuffer));
+
+    // Switch field (Serialize the sub-type)
+    serializeExtensionObjectWithMaskChild(writeBuffer);
+
+    writeBuffer.popContext("ExtensionObjectWithMask");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    ExtensionObjectWithMask _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Simple field (encodingMask)
+    lengthInBits += encodingMask.getLengthInBits();
+
+    // Length of sub-type elements will be added by sub-type...
+
+    return lengthInBits;
+  }
+
+  public static ExtensionObjectBuilder staticParseExtensionObjectBuilder(
+      ReadBuffer readBuffer, Integer extensionId, Boolean includeEncodingMask)
+      throws ParseException {
+    readBuffer.pullContext("ExtensionObjectWithMask");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    ExtensionObjectEncodingMask encodingMask =
+        readSimpleField(
+            "encodingMask",
+            new DataReaderComplexDefault<>(
+                () -> ExtensionObjectEncodingMask.staticParse(readBuffer), readBuffer));
+
+    // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
+    ExtensionObjectWithMaskBuilder builder = null;
+    if (EvaluationHelper.equals(encodingMask.getXmlBody(), (boolean) false)
+        && EvaluationHelper.equals(encodingMask.getBinaryBody(), (boolean) true)) {
+      builder =
+          BinaryExtensionObjectWithMask.staticParseExtensionObjectWithMaskBuilder(
+              readBuffer, extensionId, includeEncodingMask);
+    } else if (EvaluationHelper.equals(encodingMask.getXmlBody(), (boolean) false)
+        && EvaluationHelper.equals(encodingMask.getBinaryBody(), (boolean) false)) {
+      builder =
+          NullExtensionObjectWithMask.staticParseExtensionObjectWithMaskBuilder(
+              readBuffer, extensionId, includeEncodingMask);
+    }
+    if (builder == null) {
+      throw new ParseException(
+          "Unsupported case for discriminated type"
+              + " parameters ["
+              + "encodingMaskxmlBody="
+              + encodingMask.getXmlBody()
+              + " "
+              + "encodingMaskbinaryBody="
+              + encodingMask.getBinaryBody()
+              + "]");
+    }
+
+    readBuffer.closeContext("ExtensionObjectWithMask");
+    // Create the instance
+    return new ExtensionObjectWithMaskBuilderImpl(encodingMask, builder);
+  }
+
+  public interface ExtensionObjectWithMaskBuilder {
+    ExtensionObjectWithMask build(ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask);
+  }
+
+  public static class ExtensionObjectWithMaskBuilderImpl
+      implements ExtensionObject.ExtensionObjectBuilder {
+    private final ExtensionObjectEncodingMask encodingMask;
+    private final ExtensionObjectWithMaskBuilder builder;
+
+    public ExtensionObjectWithMaskBuilderImpl(
+        ExtensionObjectEncodingMask encodingMask, ExtensionObjectWithMaskBuilder builder) {
+      this.encodingMask = encodingMask;
+      this.builder = builder;
+    }
+
+    public ExtensionObjectWithMask build(ExpandedNodeId typeId) {
+      return builder.build(typeId, encodingMask);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof ExtensionObjectWithMask)) {
+      return false;
+    }
+    ExtensionObjectWithMask that = (ExtensionObjectWithMask) o;
+    return (getEncodingMask() == that.getEncodingMask()) && super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), getEncodingMask());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldMetaData.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldMetaData.java
index 55449814954..d5e1934e19c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldMetaData.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldMetaData.java
@@ -38,8 +38,8 @@
 public class FieldMetaData extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14526";
+  public Integer getExtensionId() {
+    return (int) 14526;
   }
 
   // Properties.
@@ -236,7 +236,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FieldMetaData");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -289,8 +289,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "properties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldTargetDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldTargetDataType.java
index 49fef3fc5fc..1709c63bac1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldTargetDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FieldTargetDataType.java
@@ -38,8 +38,8 @@
 public class FieldTargetDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14746";
+  public Integer getExtensionId() {
+    return (int) 14746;
   }
 
   // Properties.
@@ -173,7 +173,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FieldTargetDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FilterOperand.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FilterOperand.java
index 8679235f725..7d2561184e2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FilterOperand.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FilterOperand.java
@@ -38,8 +38,8 @@
 public class FilterOperand extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "591";
+  public Integer getExtensionId() {
+    return (int) 591;
   }
 
   public FilterOperand() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FilterOperand");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkRequest.java
index 8b69c409ccf..7ad5cfc3d0e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkRequest.java
@@ -38,8 +38,8 @@
 public class FindServersOnNetworkRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12192";
+  public Integer getExtensionId() {
+    return (int) 12192;
   }
 
   // Properties.
@@ -144,7 +144,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FindServersOnNetworkRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -154,8 +154,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long startingRecordId = readSimpleField("startingRecordId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkResponse.java
index 3bc2df291e3..d764b945dc7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersOnNetworkResponse.java
@@ -38,8 +38,8 @@
 public class FindServersOnNetworkResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12193";
+  public Integer getExtensionId() {
+    return (int) 12193;
   }
 
   // Properties.
@@ -125,7 +125,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FindServersOnNetworkResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -135,8 +135,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     long lastCounterResetTime =
@@ -150,7 +149,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServerOnNetwork)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("12191")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (12191)),
                 readBuffer),
             noOfServers);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersRequest.java
index 183db92d67c..bc02bb71769 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersRequest.java
@@ -38,8 +38,8 @@
 public class FindServersRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "422";
+  public Integer getExtensionId() {
+    return (int) 422;
   }
 
   // Properties.
@@ -153,7 +153,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FindServersRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -163,8 +163,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     PascalString endpointUrl =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersResponse.java
index 7ef90100ad2..79e8a991dfe 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/FindServersResponse.java
@@ -38,8 +38,8 @@
 public class FindServersResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "425";
+  public Integer getExtensionId() {
+    return (int) 425;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("FindServersResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -121,8 +121,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfServers = readImplicitField("noOfServers", readSignedInt(readBuffer, 32));
@@ -133,7 +132,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ApplicationDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("310")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (310)),
                 readBuffer),
             noOfServers);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Frame.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Frame.java
index a6b0b533859..958f1a45326 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Frame.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Frame.java
@@ -38,8 +38,8 @@
 public class Frame extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "18815";
+  public Integer getExtensionId() {
+    return (int) 18815;
   }
 
   public Frame() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Frame");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributeValue.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributeValue.java
index 77dae871f64..465d56b42fa 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributeValue.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributeValue.java
@@ -38,8 +38,8 @@
 public class GenericAttributeValue extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "17608";
+  public Integer getExtensionId() {
+    return (int) 17608;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("GenericAttributeValue");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributes.java
index 0fb3e4b2d21..ce5556351e8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GenericAttributes.java
@@ -38,8 +38,8 @@
 public class GenericAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "17609";
+  public Integer getExtensionId() {
+    return (int) 17609;
   }
 
   // Properties.
@@ -167,7 +167,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("GenericAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -200,7 +200,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (GenericAttributeValue)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("17608")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (17608)),
                 readBuffer),
             noOfAttributeValues);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsRequest.java
index f5d034297b3..9a5d308ea79 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsRequest.java
@@ -38,8 +38,8 @@
 public class GetEndpointsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "428";
+  public Integer getExtensionId() {
+    return (int) 428;
   }
 
   // Properties.
@@ -153,7 +153,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("GetEndpointsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -163,8 +163,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     PascalString endpointUrl =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsResponse.java
index d31c6aa3578..ebbfec40eb0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/GetEndpointsResponse.java
@@ -38,8 +38,8 @@
 public class GetEndpointsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "431";
+  public Integer getExtensionId() {
+    return (int) 431;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("GetEndpointsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -121,8 +121,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfEndpoints = readImplicitField("noOfEndpoints", readSignedInt(readBuffer, 32));
@@ -133,7 +132,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfEndpoints);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryData.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryData.java
index ae6e7b01fa7..efaade8d85f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryData.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryData.java
@@ -38,8 +38,8 @@
 public class HistoryData extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "658";
+  public Integer getExtensionId() {
+    return (int) 658;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryData");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEvent.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEvent.java
index a2a578ccb94..2419cd4e80b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEvent.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEvent.java
@@ -38,8 +38,8 @@
 public class HistoryEvent extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "661";
+  public Integer getExtensionId() {
+    return (int) 661;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryEvent");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -112,7 +112,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryEventFieldList)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("922")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (922)),
                 readBuffer),
             noOfEvents);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEventFieldList.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEventFieldList.java
index 123f40a4cb5..c790d99b03e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEventFieldList.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryEventFieldList.java
@@ -38,8 +38,8 @@
 public class HistoryEventFieldList extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "922";
+  public Integer getExtensionId() {
+    return (int) 922;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryEventFieldList");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedData.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedData.java
index 33257ebf756..572e0e3bb68 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedData.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedData.java
@@ -38,8 +38,8 @@
 public class HistoryModifiedData extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "11219";
+  public Integer getExtensionId() {
+    return (int) 11219;
   }
 
   // Properties.
@@ -127,7 +127,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryModifiedData");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -149,7 +149,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ModificationInfo)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("11218")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (11218)),
                 readBuffer),
             noOfModificationInfos);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedEvent.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedEvent.java
index 80976a936fb..54fd9636b4c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedEvent.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryModifiedEvent.java
@@ -38,8 +38,8 @@
 public class HistoryModifiedEvent extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32826";
+  public Integer getExtensionId() {
+    return (int) 32826;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryModifiedEvent");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -141,7 +141,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryEventFieldList)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("922")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (922)),
                 readBuffer),
             noOfEvents);
 
@@ -154,7 +154,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ModificationInfo)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("11218")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (11218)),
                 readBuffer),
             noOfModificationInfos);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadDetails.java
index 69e118f48a5..b222508e7be 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadDetails.java
@@ -38,8 +38,8 @@
 public class HistoryReadDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "643";
+  public Integer getExtensionId() {
+    return (int) 643;
   }
 
   public HistoryReadDetails() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryReadDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java
index 1d01ed023cf..7ded25168ed 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java
@@ -38,8 +38,8 @@
 public class HistoryReadRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "664";
+  public Integer getExtensionId() {
+    return (int) 664;
   }
 
   // Properties.
@@ -167,7 +167,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryReadRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -177,8 +177,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     ExtensionObject historyReadDetails =
@@ -208,7 +207,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryReadValueId)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("637")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (637)),
                 readBuffer),
             noOfNodesToRead);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResponse.java
index 625da7ef122..452f844c82c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResponse.java
@@ -38,8 +38,8 @@
 public class HistoryReadResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "667";
+  public Integer getExtensionId() {
+    return (int) 667;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryReadResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryReadResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("640")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (640)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResult.java
index d96d9e3b9ef..0b4bd744238 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadResult.java
@@ -38,8 +38,8 @@
 public class HistoryReadResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "640";
+  public Integer getExtensionId() {
+    return (int) 640;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryReadResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadValueId.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadValueId.java
index c32e9f6898a..e5e00930019 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadValueId.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadValueId.java
@@ -38,8 +38,8 @@
 public class HistoryReadValueId extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "637";
+  public Integer getExtensionId() {
+    return (int) 637;
   }
 
   // Properties.
@@ -126,7 +126,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryReadValueId");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateDetails.java
index cc45b4ee48e..8c85716c8be 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateDetails.java
@@ -38,8 +38,8 @@
 public class HistoryUpdateDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "679";
+  public Integer getExtensionId() {
+    return (int) 679;
   }
 
   public HistoryUpdateDetails() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryUpdateDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateRequest.java
index 475bdf597e7..6d4b6462a42 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateRequest.java
@@ -38,8 +38,8 @@
 public class HistoryUpdateRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "700";
+  public Integer getExtensionId() {
+    return (int) 700;
   }
 
   // Properties.
@@ -114,7 +114,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryUpdateRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -124,8 +124,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfHistoryUpdateDetails =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResponse.java
index 7f038317cd4..817063fbc26 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResponse.java
@@ -38,8 +38,8 @@
 public class HistoryUpdateResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "703";
+  public Integer getExtensionId() {
+    return (int) 703;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryUpdateResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryUpdateResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("697")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (697)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResult.java
index ab17afb6da4..e0a8e99d9fc 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryUpdateResult.java
@@ -38,8 +38,8 @@
 public class HistoryUpdateResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "697";
+  public Integer getExtensionId() {
+    return (int) 697;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("HistoryUpdateResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/IdentityMappingRuleType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/IdentityMappingRuleType.java
index f31e74d3049..197cd99eaeb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/IdentityMappingRuleType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/IdentityMappingRuleType.java
@@ -38,8 +38,8 @@
 public class IdentityMappingRuleType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15636";
+  public Integer getExtensionId() {
+    return (int) 15636;
   }
 
   // Properties.
@@ -104,7 +104,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("IdentityMappingRuleType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetReaderMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetReaderMessageDataType.java
index 6b9e904b25d..b9e80cd139c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetReaderMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetReaderMessageDataType.java
@@ -38,8 +38,8 @@
 public class JsonDataSetReaderMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15667";
+  public Integer getExtensionId() {
+    return (int) 15667;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("JsonDataSetReaderMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetWriterMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetWriterMessageDataType.java
index 655a2271704..51eda8bad32 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetWriterMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonDataSetWriterMessageDataType.java
@@ -38,8 +38,8 @@
 public class JsonDataSetWriterMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15666";
+  public Integer getExtensionId() {
+    return (int) 15666;
   }
 
   // Properties.
@@ -92,7 +92,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("JsonDataSetWriterMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonWriterGroupMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonWriterGroupMessageDataType.java
index b424cf9ad5b..29aecc08a93 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonWriterGroupMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/JsonWriterGroupMessageDataType.java
@@ -38,8 +38,8 @@
 public class JsonWriterGroupMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15659";
+  public Integer getExtensionId() {
+    return (int) 15659;
   }
 
   // Properties.
@@ -92,7 +92,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("JsonWriterGroupMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/KeyValuePair.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/KeyValuePair.java
index 5b5e2b31960..ac32914e3a4 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/KeyValuePair.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/KeyValuePair.java
@@ -38,8 +38,8 @@
 public class KeyValuePair extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14535";
+  public Integer getExtensionId() {
+    return (int) 14535;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("KeyValuePair");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LinearConversionDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LinearConversionDataType.java
index cc13e8e0a20..d8327b68282 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LinearConversionDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LinearConversionDataType.java
@@ -38,8 +38,8 @@
 public class LinearConversionDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32437";
+  public Integer getExtensionId() {
+    return (int) 32437;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("LinearConversionDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LiteralOperand.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LiteralOperand.java
index 57962f1cfe6..7400f6c1baa 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LiteralOperand.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LiteralOperand.java
@@ -38,8 +38,8 @@
 public class LiteralOperand extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "597";
+  public Integer getExtensionId() {
+    return (int) 597;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("LiteralOperand");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MdnsDiscoveryConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MdnsDiscoveryConfiguration.java
index ad476466de7..86d414208de 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MdnsDiscoveryConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MdnsDiscoveryConfiguration.java
@@ -38,8 +38,8 @@
 public class MdnsDiscoveryConfiguration extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12893";
+  public Integer getExtensionId() {
+    return (int) 12893;
   }
 
   // Properties.
@@ -114,7 +114,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MdnsDiscoveryConfiguration");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MethodAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MethodAttributes.java
index 6b0a1175df2..335c7ea0fbd 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MethodAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MethodAttributes.java
@@ -38,8 +38,8 @@
 public class MethodAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "360";
+  public Integer getExtensionId() {
+    return (int) 360;
   }
 
   // Properties.
@@ -171,7 +171,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MethodAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModelChangeStructureDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModelChangeStructureDataType.java
index 94a55addf35..e304dbbcc7e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModelChangeStructureDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModelChangeStructureDataType.java
@@ -38,8 +38,8 @@
 public class ModelChangeStructureDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "879";
+  public Integer getExtensionId() {
+    return (int) 879;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModelChangeStructureDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModificationInfo.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModificationInfo.java
index 7572bcd3af7..2b2c531ccd0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModificationInfo.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModificationInfo.java
@@ -38,8 +38,8 @@
 public class ModificationInfo extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "11218";
+  public Integer getExtensionId() {
+    return (int) 11218;
   }
 
   // Properties.
@@ -117,7 +117,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModificationInfo");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsRequest.java
index 1a408a1bf8e..a960f8efddb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsRequest.java
@@ -38,8 +38,8 @@
 public class ModifyMonitoredItemsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "763";
+  public Integer getExtensionId() {
+    return (int) 763;
   }
 
   // Properties.
@@ -147,7 +147,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModifyMonitoredItemsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -157,8 +157,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
@@ -178,7 +177,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoredItemModifyRequest)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("757")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (757)),
                 readBuffer),
             noOfItemsToModify);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsResponse.java
index 4172898de91..05c0fbf5cac 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifyMonitoredItemsResponse.java
@@ -38,8 +38,8 @@
 public class ModifyMonitoredItemsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "766";
+  public Integer getExtensionId() {
+    return (int) 766;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModifyMonitoredItemsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -163,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoredItemModifyResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("760")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (760)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionRequest.java
index 54f3edadb10..dc3da92420e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionRequest.java
@@ -38,8 +38,8 @@
 public class ModifySubscriptionRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "793";
+  public Integer getExtensionId() {
+    return (int) 793;
   }
 
   // Properties.
@@ -172,7 +172,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModifySubscriptionRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -182,8 +182,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionResponse.java
index 4aec9eb4ff6..8e485b17170 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ModifySubscriptionResponse.java
@@ -38,8 +38,8 @@
 public class ModifySubscriptionResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "796";
+  public Integer getExtensionId() {
+    return (int) 796;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ModifySubscriptionResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -138,8 +138,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     double revisedPublishingInterval =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateRequest.java
index 58950813b5f..de57aeb25ea 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateRequest.java
@@ -38,8 +38,8 @@
 public class MonitoredItemCreateRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "745";
+  public Integer getExtensionId() {
+    return (int) 745;
   }
 
   // Properties.
@@ -118,7 +118,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoredItemCreateRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -127,9 +127,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "itemToMonitor",
             new DataReaderComplexDefault<>(
-                () ->
-                    (ReadValueId)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("628")),
+                () -> (ReadValueId) ExtensionObjectDefinition.staticParse(readBuffer, (int) (628)),
                 readBuffer));
 
     MonitoringMode monitoringMode =
@@ -145,7 +143,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoringParameters)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("742")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (742)),
                 readBuffer));
 
     readBuffer.closeContext("MonitoredItemCreateRequest");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateResult.java
index 24924d26297..9365f53a8d4 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemCreateResult.java
@@ -38,8 +38,8 @@
 public class MonitoredItemCreateResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "748";
+  public Integer getExtensionId() {
+    return (int) 748;
   }
 
   // Properties.
@@ -139,7 +139,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoredItemCreateResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyRequest.java
index 1e1ec745e6c..7b90ab8c2ae 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyRequest.java
@@ -38,8 +38,8 @@
 public class MonitoredItemModifyRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "757";
+  public Integer getExtensionId() {
+    return (int) 757;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoredItemModifyRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -112,7 +112,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (MonitoringParameters)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("742")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (742)),
                 readBuffer));
 
     readBuffer.closeContext("MonitoredItemModifyRequest");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyResult.java
index f401da7c8e3..45d6fa589ce 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemModifyResult.java
@@ -38,8 +38,8 @@
 public class MonitoredItemModifyResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "760";
+  public Integer getExtensionId() {
+    return (int) 760;
   }
 
   // Properties.
@@ -126,7 +126,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoredItemModifyResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemNotification.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemNotification.java
index 43a07d75737..53a1ebbf602 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemNotification.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoredItemNotification.java
@@ -38,8 +38,8 @@
 public class MonitoredItemNotification extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "808";
+  public Integer getExtensionId() {
+    return (int) 808;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoredItemNotification");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilter.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilter.java
index a754fd9ac49..bedfd805efb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilter.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilter.java
@@ -38,8 +38,8 @@
 public class MonitoringFilter extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "721";
+  public Integer getExtensionId() {
+    return (int) 721;
   }
 
   public MonitoringFilter() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoringFilter");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilterResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilterResult.java
index 246e200472a..e680ab1720a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilterResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringFilterResult.java
@@ -38,8 +38,8 @@
 public class MonitoringFilterResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "733";
+  public Integer getExtensionId() {
+    return (int) 733;
   }
 
   public MonitoringFilterResult() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoringFilterResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java
index 812d62f35e6..17fb2776378 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java
@@ -38,8 +38,8 @@
 public class MonitoringParameters extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "742";
+  public Integer getExtensionId() {
+    return (int) 742;
   }
 
   // Properties.
@@ -144,7 +144,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("MonitoringParameters");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressDataType.java
index aa3e6fa5b9a..be88d852d7f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressDataType.java
@@ -38,8 +38,8 @@
 public class NetworkAddressDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15504";
+  public Integer getExtensionId() {
+    return (int) 15504;
   }
 
   // Properties.
@@ -86,7 +86,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NetworkAddressDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressUrlDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressUrlDataType.java
index 3497f3b2381..f6cafc34708 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressUrlDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkAddressUrlDataType.java
@@ -38,8 +38,8 @@
 public class NetworkAddressUrlDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15512";
+  public Integer getExtensionId() {
+    return (int) 15512;
   }
 
   // Properties.
@@ -98,7 +98,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NetworkAddressUrlDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkGroupDataType.java
index cb8034ba31b..6d56d32280e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkGroupDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NetworkGroupDataType.java
@@ -38,8 +38,8 @@
 public class NetworkGroupDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "11946";
+  public Integer getExtensionId() {
+    return (int) 11946;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NetworkGroupDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -130,7 +130,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointUrlListDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("11945")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (11945)),
                 readBuffer),
             noOfNetworkPaths);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeAttributes.java
index 418665e09d4..d66af7cc68c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeAttributes.java
@@ -38,8 +38,8 @@
 public class NodeAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "351";
+  public Integer getExtensionId() {
+    return (int) 351;
   }
 
   // Properties.
@@ -139,7 +139,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NodeAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java
index 849018adff2..19812e6f31e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java
@@ -38,8 +38,8 @@
 public class NodeReference extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "582";
+  public Integer getExtensionId() {
+    return (int) 582;
   }
 
   // Properties.
@@ -145,7 +145,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NodeReference");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java
index 0132bdd461a..3853ad3d495 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java
@@ -38,8 +38,8 @@
 public class NodeTypeDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "575";
+  public Integer getExtensionId() {
+    return (int) 575;
   }
 
   // Properties.
@@ -134,7 +134,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NodeTypeDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -158,7 +158,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (QueryDataDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("572")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (572)),
                 readBuffer),
             noOfDataToReturn);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationData.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationData.java
index 7018d9b1afa..97fda1b88ff 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationData.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationData.java
@@ -38,8 +38,8 @@
 public class NotificationData extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "947";
+  public Integer getExtensionId() {
+    return (int) 947;
   }
 
   public NotificationData() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NotificationData");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationMessage.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationMessage.java
index 4881511114f..213f786964c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationMessage.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NotificationMessage.java
@@ -38,8 +38,8 @@
 public class NotificationMessage extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "805";
+  public Integer getExtensionId() {
+    return (int) 805;
   }
 
   // Properties.
@@ -126,7 +126,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NotificationMessage");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtension.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtension.java
index 1e43e4c218d..4baadf013d4 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtension.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtension.java
@@ -38,8 +38,8 @@
 public class NullExtension extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "0";
+  public Integer getExtensionId() {
+    return (int) 0;
   }
 
   public NullExtension() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("NullExtension");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObject.java
similarity index 56%
rename from plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java
rename to plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObject.java
index ea54c632d16..03a5ff7fd9b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObject.java
@@ -35,41 +35,37 @@
 
 // Code generated by code-generation. DO NOT EDIT.
 
-public class ExtensionHeader implements Message {
+public class NullExtensionObject extends EncodedObject implements Message {
 
-  // Properties.
-  protected final boolean xmlbody;
-  protected final boolean binaryBody;
+  // Accessors for discriminator values.
+  public Boolean getEncodingMaskXmlBody() {
+    return (boolean) false;
+  }
 
-  public ExtensionHeader(boolean xmlbody, boolean binaryBody) {
-    super();
-    this.xmlbody = xmlbody;
-    this.binaryBody = binaryBody;
+  public Boolean getEncodingMaskBinaryBody() {
+    return (boolean) false;
   }
 
-  public boolean getXmlbody() {
-    return xmlbody;
+  public NullExtensionObject() {
+    super();
   }
 
-  public boolean getBinaryBody() {
-    return binaryBody;
+  public ExtensionObjectDefinition getBody() {
+    return (ExtensionObjectDefinition) (null);
   }
 
-  public void serialize(WriteBuffer writeBuffer) throws SerializationException {
+  @Override
+  protected void serializeEncodedObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    writeBuffer.pushContext("ExtensionHeader");
+    writeBuffer.pushContext("NullExtensionObject");
 
-    // Reserved Field (reserved)
-    writeReservedField("reserved", (byte) 0x00, writeSignedByte(writeBuffer, 5));
+    // Virtual field (doesn't actually serialize anything, just makes the value available)
+    ExtensionObjectDefinition body = getBody();
+    writeBuffer.writeVirtual("body", body);
 
-    // Simple Field (xmlbody)
-    writeSimpleField("xmlbody", xmlbody, writeBoolean(writeBuffer));
-
-    // Simple Field (binaryBody)
-    writeSimpleField("binaryBody", binaryBody, writeBoolean(writeBuffer));
-
-    writeBuffer.popContext("ExtensionHeader");
+    writeBuffer.popContext("NullExtensionObject");
   }
 
   @Override
@@ -79,44 +75,37 @@ public int getLengthInBytes() {
 
   @Override
   public int getLengthInBits() {
-    int lengthInBits = 0;
-    ExtensionHeader _value = this;
+    int lengthInBits = super.getLengthInBits();
+    NullExtensionObject _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    // Reserved Field (reserved)
-    lengthInBits += 5;
-
-    // Simple field (xmlbody)
-    lengthInBits += 1;
-
-    // Simple field (binaryBody)
-    lengthInBits += 1;
+    // A virtual field doesn't have any in- or output.
 
     return lengthInBits;
   }
 
-  public static ExtensionHeader staticParse(ReadBuffer readBuffer, Object... args)
+  public static EncodedObjectBuilder staticParseEncodedObjectBuilder(
+      ReadBuffer readBuffer, Integer extensionId, ExtensionObjectEncodingMask encodingMask)
       throws ParseException {
-    PositionAware positionAware = readBuffer;
-    return staticParse(readBuffer);
-  }
-
-  public static ExtensionHeader staticParse(ReadBuffer readBuffer) throws ParseException {
-    readBuffer.pullContext("ExtensionHeader");
+    readBuffer.pullContext("NullExtensionObject");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    ExtensionObjectDefinition body =
+        readVirtualField("body", ExtensionObjectDefinition.class, null);
 
-    Byte reservedField0 = readReservedField("reserved", readSignedByte(readBuffer, 5), (byte) 0x00);
+    readBuffer.closeContext("NullExtensionObject");
+    // Create the instance
+    return new NullExtensionObjectBuilderImpl();
+  }
 
-    boolean xmlbody = readSimpleField("xmlbody", readBoolean(readBuffer));
+  public static class NullExtensionObjectBuilderImpl implements EncodedObject.EncodedObjectBuilder {
 
-    boolean binaryBody = readSimpleField("binaryBody", readBoolean(readBuffer));
+    public NullExtensionObjectBuilderImpl() {}
 
-    readBuffer.closeContext("ExtensionHeader");
-    // Create the instance
-    ExtensionHeader _extensionHeader;
-    _extensionHeader = new ExtensionHeader(xmlbody, binaryBody);
-    return _extensionHeader;
+    public NullExtensionObject build() {
+      NullExtensionObject nullExtensionObject = new NullExtensionObject();
+      return nullExtensionObject;
+    }
   }
 
   @Override
@@ -124,16 +113,16 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    if (!(o instanceof ExtensionHeader)) {
+    if (!(o instanceof NullExtensionObject)) {
       return false;
     }
-    ExtensionHeader that = (ExtensionHeader) o;
-    return (getXmlbody() == that.getXmlbody()) && (getBinaryBody() == that.getBinaryBody()) && true;
+    NullExtensionObject that = (NullExtensionObject) o;
+    return super.equals(that) && true;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(getXmlbody(), getBinaryBody());
+    return Objects.hash(super.hashCode());
   }
 
   @Override
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObjectWithMask.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObjectWithMask.java
new file mode 100644
index 00000000000..af7d0489e6c
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NullExtensionObjectWithMask.java
@@ -0,0 +1,142 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public class NullExtensionObjectWithMask extends ExtensionObjectWithMask implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getEncodingMaskXmlBody() {
+    return (boolean) false;
+  }
+
+  public Boolean getEncodingMaskBinaryBody() {
+    return (boolean) false;
+  }
+
+  public NullExtensionObjectWithMask(
+      ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask) {
+    super(typeId, encodingMask);
+  }
+
+  public ExtensionObjectDefinition getBody() {
+    return (ExtensionObjectDefinition) (null);
+  }
+
+  @Override
+  protected void serializeExtensionObjectWithMaskChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("NullExtensionObjectWithMask");
+
+    // Virtual field (doesn't actually serialize anything, just makes the value available)
+    ExtensionObjectDefinition body = getBody();
+    writeBuffer.writeVirtual("body", body);
+
+    writeBuffer.popContext("NullExtensionObjectWithMask");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    NullExtensionObjectWithMask _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // A virtual field doesn't have any in- or output.
+
+    return lengthInBits;
+  }
+
+  public static ExtensionObjectWithMaskBuilder staticParseExtensionObjectWithMaskBuilder(
+      ReadBuffer readBuffer, Integer extensionId, Boolean includeEncodingMask)
+      throws ParseException {
+    readBuffer.pullContext("NullExtensionObjectWithMask");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    ExtensionObjectDefinition body =
+        readVirtualField("body", ExtensionObjectDefinition.class, null);
+
+    readBuffer.closeContext("NullExtensionObjectWithMask");
+    // Create the instance
+    return new NullExtensionObjectWithMaskBuilderImpl();
+  }
+
+  public static class NullExtensionObjectWithMaskBuilderImpl
+      implements ExtensionObjectWithMask.ExtensionObjectWithMaskBuilder {
+
+    public NullExtensionObjectWithMaskBuilderImpl() {}
+
+    public NullExtensionObjectWithMask build(
+        ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask) {
+      NullExtensionObjectWithMask nullExtensionObjectWithMask =
+          new NullExtensionObjectWithMask(typeId, encodingMask);
+      return nullExtensionObjectWithMask;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof NullExtensionObjectWithMask)) {
+      return false;
+    }
+    NullExtensionObjectWithMask that = (NullExtensionObjectWithMask) o;
+    return super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectAttributes.java
index 8baa7ae608f..8c5a2cbeafd 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectAttributes.java
@@ -38,8 +38,8 @@
 public class ObjectAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "354";
+  public Integer getExtensionId() {
+    return (int) 354;
   }
 
   // Properties.
@@ -152,7 +152,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ObjectAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectTypeAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectTypeAttributes.java
index 7fa9a6f3e1e..91dd0341dc8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectTypeAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ObjectTypeAttributes.java
@@ -38,8 +38,8 @@
 public class ObjectTypeAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "363";
+  public Integer getExtensionId() {
+    return (int) 363;
   }
 
   // Properties.
@@ -158,7 +158,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ObjectTypeAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaVector.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaVector.java
index a9093ebb500..81377c4eb6c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaVector.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaVector.java
@@ -38,8 +38,8 @@
 public class OpcuaVector extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "18809";
+  public Integer getExtensionId() {
+    return (int) 18809;
   }
 
   public OpcuaVector() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("OpcuaVector");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelRequest.java
index d00495cfd74..61596c33f2e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelRequest.java
@@ -38,8 +38,8 @@
 public class OpenSecureChannelRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "446";
+  public Integer getExtensionId() {
+    return (int) 446;
   }
 
   // Properties.
@@ -166,7 +166,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("OpenSecureChannelRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -176,8 +176,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long clientProtocolVersion =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelResponse.java
index 6275e5f8932..cb8819fbb93 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpenSecureChannelResponse.java
@@ -38,8 +38,8 @@
 public class OpenSecureChannelResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "449";
+  public Integer getExtensionId() {
+    return (int) 449;
   }
 
   // Properties.
@@ -126,7 +126,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("OpenSecureChannelResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -136,8 +136,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     long serverProtocolVersion =
@@ -149,7 +148,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ChannelSecurityToken)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("443")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (443)),
                 readBuffer));
 
     PascalByteString serverNonce =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OptionSet.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OptionSet.java
index 66e8d5cf2a3..4eea9378e10 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OptionSet.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OptionSet.java
@@ -38,8 +38,8 @@
 public class OptionSet extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12757";
+  public Integer getExtensionId() {
+    return (int) 12757;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("OptionSet");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Orientation.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Orientation.java
index 525f3ccc826..437a141227e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Orientation.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Orientation.java
@@ -38,8 +38,8 @@
 public class Orientation extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "18813";
+  public Integer getExtensionId() {
+    return (int) 18813;
   }
 
   public Orientation() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Orientation");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ParsingResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ParsingResult.java
index 2d65858161d..87ef2da7d33 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ParsingResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ParsingResult.java
@@ -38,8 +38,8 @@
 public class ParsingResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "612";
+  public Integer getExtensionId() {
+    return (int) 612;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ParsingResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java
index ae3d372cbb7..6fa8122113b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java
@@ -73,8 +73,8 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     int stringLength = getStringLength();
     writeBuffer.writeVirtual("stringLength", stringLength);
 
-    // Simple Field (stringValue)
-    writeSimpleField("stringValue", stringValue, writeString(writeBuffer, (stringLength) * (8)));
+    // Optional Field (stringValue) (Can be skipped, if the value is null)
+    writeOptionalField("stringValue", stringValue, writeString(writeBuffer, (stringLength) * (8)));
 
     writeBuffer.popContext("PascalString");
   }
@@ -95,8 +95,10 @@ public int getLengthInBits() {
 
     // A virtual field doesn't have any in- or output.
 
-    // Simple field (stringValue)
-    lengthInBits += (getStringLength()) * (8);
+    // Optional Field (stringValue)
+    if (stringValue != null) {
+      lengthInBits += (getStringLength()) * (8);
+    }
 
     return lengthInBits;
   }
@@ -121,7 +123,8 @@ public static PascalString staticParse(ReadBuffer readBuffer) throws ParseExcept
                 sLength));
 
     String stringValue =
-        readSimpleField("stringValue", readString(readBuffer, (stringLength) * (8)));
+        readOptionalField(
+            "stringValue", readString(readBuffer, (stringLength) * (8)), (sLength) != (-(1)));
 
     readBuffer.closeContext("PascalString");
     // Create the instance
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableNodeId.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableNodeId.java
index bbeb2a334ec..3702486c6cd 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableNodeId.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableNodeId.java
@@ -38,8 +38,8 @@
 public class PortableNodeId extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "24108";
+  public Integer getExtensionId() {
+    return (int) 24108;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PortableNodeId");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableQualifiedName.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableQualifiedName.java
index 0edea488045..658a0ff03b5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableQualifiedName.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PortableQualifiedName.java
@@ -38,8 +38,8 @@
 public class PortableQualifiedName extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "24107";
+  public Integer getExtensionId() {
+    return (int) 24107;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PortableQualifiedName");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PriorityMappingEntryType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PriorityMappingEntryType.java
index 9dd9f803a03..b4666880357 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PriorityMappingEntryType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PriorityMappingEntryType.java
@@ -38,8 +38,8 @@
 public class PriorityMappingEntryType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "25222";
+  public Integer getExtensionId() {
+    return (int) 25222;
   }
 
   // Properties.
@@ -125,7 +125,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PriorityMappingEntryType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnostic2DataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnostic2DataType.java
index ffa92ae0cc2..a724c84d433 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnostic2DataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnostic2DataType.java
@@ -38,8 +38,8 @@
 public class ProgramDiagnostic2DataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "24035";
+  public Integer getExtensionId() {
+    return (int) 24035;
   }
 
   // Properties.
@@ -314,7 +314,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ProgramDiagnostic2DataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -351,8 +351,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "lastMethodInputArguments",
             new DataReaderComplexDefault<>(
-                () ->
-                    (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("298")),
+                () -> (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (int) (298)),
                 readBuffer),
             noOfLastMethodInputArguments);
 
@@ -363,8 +362,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "lastMethodOutputArguments",
             new DataReaderComplexDefault<>(
-                () ->
-                    (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("298")),
+                () -> (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (int) (298)),
                 readBuffer),
             noOfLastMethodOutputArguments);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnosticDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnosticDataType.java
index 7e04ba88c96..24762ab046d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnosticDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ProgramDiagnosticDataType.java
@@ -38,8 +38,8 @@
 public class ProgramDiagnosticDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "896";
+  public Integer getExtensionId() {
+    return (int) 896;
   }
 
   // Properties.
@@ -252,7 +252,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ProgramDiagnosticDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -289,8 +289,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "lastMethodInputArguments",
             new DataReaderComplexDefault<>(
-                () ->
-                    (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("298")),
+                () -> (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (int) (298)),
                 readBuffer),
             noOfLastMethodInputArguments);
 
@@ -301,8 +300,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "lastMethodOutputArguments",
             new DataReaderComplexDefault<>(
-                () ->
-                    (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("298")),
+                () -> (Argument) ExtensionObjectDefinition.staticParse(readBuffer, (int) (298)),
                 readBuffer),
             noOfLastMethodOutputArguments);
 
@@ -312,9 +310,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "lastMethodReturnStatus",
             new DataReaderComplexDefault<>(
-                () ->
-                    (StatusResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("301")),
+                () -> (StatusResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (301)),
                 readBuffer));
 
     readBuffer.closeContext("ProgramDiagnosticDataType");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfiguration2DataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfiguration2DataType.java
index 22933e3bf53..7c4219000c8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfiguration2DataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfiguration2DataType.java
@@ -38,8 +38,8 @@
 public class PubSubConfiguration2DataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23604";
+  public Integer getExtensionId() {
+    return (int) 23604;
   }
 
   // Properties.
@@ -345,7 +345,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubConfiguration2DataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -359,7 +359,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PublishedDataSetDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15580")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15580)),
                 readBuffer),
             noOfPublishedDataSets);
 
@@ -371,7 +371,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PubSubConnectionDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15619")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15619)),
                 readBuffer),
             noOfConnections);
 
@@ -389,7 +389,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (StandaloneSubscribedDataSetDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("23602")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (23602)),
                 readBuffer),
             noOfSubscribedDataSets);
 
@@ -401,7 +401,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetMetaDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14525")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14525)),
                 readBuffer),
             noOfDataSetClasses);
 
@@ -414,7 +414,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfDefaultSecurityKeyServices);
 
@@ -426,7 +426,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SecurityGroupDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("23603")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (23603)),
                 readBuffer),
             noOfSecurityGroups);
 
@@ -439,7 +439,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PubSubKeyPushTargetDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("25272")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (25272)),
                 readBuffer),
             noOfPubSubKeyPushTargets);
 
@@ -454,8 +454,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "configurationProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfConfigurationProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java
index 5d9cee2720b..7caeee45478 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java
@@ -38,8 +38,8 @@
 public class PubSubConfigurationDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15532";
+  public Integer getExtensionId() {
+    return (int) 15532;
   }
 
   // Properties.
@@ -148,7 +148,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubConfigurationDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -162,7 +162,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PublishedDataSetDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15580")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15580)),
                 readBuffer),
             noOfPublishedDataSets);
 
@@ -174,7 +174,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PubSubConnectionDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15619")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15619)),
                 readBuffer),
             noOfConnections);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationRefDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationRefDataType.java
index 78cf3e560bb..7c475c05467 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationRefDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationRefDataType.java
@@ -38,8 +38,8 @@
 public class PubSubConfigurationRefDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "25521";
+  public Integer getExtensionId() {
+    return (int) 25521;
   }
 
   // Properties.
@@ -132,7 +132,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubConfigurationRefDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationValueDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationValueDataType.java
index dbc0b64a450..73be6f55da9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationValueDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationValueDataType.java
@@ -38,8 +38,8 @@
 public class PubSubConfigurationValueDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "25522";
+  public Integer getExtensionId() {
+    return (int) 25522;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubConfigurationValueDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -122,7 +122,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PubSubConfigurationRefDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("25521")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (25521)),
                 readBuffer));
 
     PascalString name =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java
index 6af9bce4f6f..6b88366257b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java
@@ -38,8 +38,8 @@
 public class PubSubConnectionDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15619";
+  public Integer getExtensionId() {
+    return (int) 15619;
   }
 
   // Properties.
@@ -244,7 +244,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubConnectionDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -283,8 +283,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "connectionProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfConnectionProperties);
 
@@ -302,7 +301,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (WriterGroupDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15482")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15482)),
                 readBuffer),
             noOfWriterGroups);
 
@@ -314,7 +313,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ReaderGroupDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15522")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15522)),
                 readBuffer),
             noOfReaderGroups);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java
index 377bfff5f9f..84755c87634 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java
@@ -38,8 +38,8 @@
 public class PubSubGroupDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15611";
+  public Integer getExtensionId() {
+    return (int) 15611;
   }
 
   // Properties.
@@ -210,7 +210,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubGroupDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -246,7 +246,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfSecurityKeyServices);
 
@@ -261,8 +261,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "groupProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfGroupProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubKeyPushTargetDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubKeyPushTargetDataType.java
index 6d3a2a27a05..e9d8cf664d6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubKeyPushTargetDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubKeyPushTargetDataType.java
@@ -38,8 +38,8 @@
 public class PubSubKeyPushTargetDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "25272";
+  public Integer getExtensionId() {
+    return (int) 25272;
   }
 
   // Properties.
@@ -238,7 +238,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PubSubKeyPushTargetDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -273,7 +273,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (UserTokenPolicy)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("306")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (306)),
                 readBuffer));
 
     int requestedKeyCount = readSimpleField("requestedKeyCount", readUnsignedInt(readBuffer, 16));
@@ -288,8 +288,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "pushTargetProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfPushTargetProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishRequest.java
index 3a7575aea2c..1d6781bf776 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishRequest.java
@@ -38,8 +38,8 @@
 public class PublishRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "826";
+  public Integer getExtensionId() {
+    return (int) 826;
   }
 
   // Properties.
@@ -120,7 +120,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -130,8 +130,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfSubscriptionAcknowledgements =
@@ -143,7 +142,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SubscriptionAcknowledgement)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("823")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (823)),
                 readBuffer),
             noOfSubscriptionAcknowledgements);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java
index affbd159ae4..2878e97f69a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java
@@ -38,8 +38,8 @@
 public class PublishResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "829";
+  public Integer getExtensionId() {
+    return (int) 829;
   }
 
   // Properties.
@@ -218,7 +218,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -228,8 +228,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
@@ -254,7 +253,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (NotificationMessage)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("805")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (805)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataItemsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataItemsDataType.java
index a22a4c103e5..fbf486b8de5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataItemsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataItemsDataType.java
@@ -38,8 +38,8 @@
 public class PublishedDataItemsDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15583";
+  public Integer getExtensionId() {
+    return (int) 15583;
   }
 
   // Properties.
@@ -100,7 +100,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedDataItemsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -113,7 +113,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (PublishedVariableDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14275")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14275)),
                 readBuffer),
             noOfPublishedData);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetCustomSourceDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetCustomSourceDataType.java
index fc6e79f1bc8..c403b4fd3ab 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetCustomSourceDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetCustomSourceDataType.java
@@ -39,8 +39,8 @@ public class PublishedDataSetCustomSourceDataType extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "25271";
+  public Integer getExtensionId() {
+    return (int) 25271;
   }
 
   // Properties.
@@ -92,7 +92,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedDataSetCustomSourceDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetDataType.java
index a7cbd655e76..bbcab84b045 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetDataType.java
@@ -38,8 +38,8 @@
 public class PublishedDataSetDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15580";
+  public Integer getExtensionId() {
+    return (int) 15580;
   }
 
   // Properties.
@@ -169,7 +169,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedDataSetDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -193,7 +193,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetMetaDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14525")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14525)),
                 readBuffer));
 
     int noOfExtensionFields =
@@ -204,8 +204,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "extensionFields",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfExtensionFields);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetSourceDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetSourceDataType.java
index 88a994691f5..2de243ee722 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetSourceDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedDataSetSourceDataType.java
@@ -38,8 +38,8 @@
 public class PublishedDataSetSourceDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15582";
+  public Integer getExtensionId() {
+    return (int) 15582;
   }
 
   public PublishedDataSetSourceDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedDataSetSourceDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedEventsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedEventsDataType.java
index dcddebadc52..055d7265f83 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedEventsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedEventsDataType.java
@@ -38,8 +38,8 @@
 public class PublishedEventsDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15584";
+  public Integer getExtensionId() {
+    return (int) 15584;
   }
 
   // Properties.
@@ -125,7 +125,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedEventsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -143,7 +143,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SimpleAttributeOperand)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("603")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (603)),
                 readBuffer),
             noOfSelectedFields);
 
@@ -152,8 +152,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "filter",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ContentFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("588")),
+                    (ContentFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (588)),
                 readBuffer));
 
     readBuffer.closeContext("PublishedEventsDataType");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedVariableDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedVariableDataType.java
index 730b20b4db9..4d930fc99d1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedVariableDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishedVariableDataType.java
@@ -38,8 +38,8 @@
 public class PublishedVariableDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "14275";
+  public Integer getExtensionId() {
+    return (int) 14275;
   }
 
   // Properties.
@@ -195,7 +195,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("PublishedVariableDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QosDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QosDataType.java
index 64f5c835295..ea980a40cbc 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QosDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QosDataType.java
@@ -38,8 +38,8 @@
 public class QosDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23605";
+  public Integer getExtensionId() {
+    return (int) 23605;
   }
 
   public QosDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QosDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QuantityDimension.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QuantityDimension.java
index d1e533224dc..d3847245d4b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QuantityDimension.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QuantityDimension.java
@@ -38,8 +38,8 @@
 public class QuantityDimension extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32440";
+  public Integer getExtensionId() {
+    return (int) 32440;
   }
 
   // Properties.
@@ -184,7 +184,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QuantityDimension");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataDescription.java
index bef46edaedd..100bda6da09 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataDescription.java
@@ -38,8 +38,8 @@
 public class QueryDataDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "572";
+  public Integer getExtensionId() {
+    return (int) 572;
   }
 
   // Properties.
@@ -110,7 +110,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryDataDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -119,9 +119,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "relativePath",
             new DataReaderComplexDefault<>(
-                () ->
-                    (RelativePath)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("542")),
+                () -> (RelativePath) ExtensionObjectDefinition.staticParse(readBuffer, (int) (542)),
                 readBuffer));
 
     long attributeId = readSimpleField("attributeId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataSet.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataSet.java
index 5f7cf963fdc..14c581720af 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataSet.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryDataSet.java
@@ -38,8 +38,8 @@
 public class QueryDataSet extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "579";
+  public Integer getExtensionId() {
+    return (int) 579;
   }
 
   // Properties.
@@ -125,7 +125,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryDataSet");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstRequest.java
index 551a30fe7ad..a8785bb66f5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstRequest.java
@@ -38,8 +38,8 @@
 public class QueryFirstRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "615";
+  public Integer getExtensionId() {
+    return (int) 615;
   }
 
   // Properties.
@@ -167,7 +167,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryFirstRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -177,8 +177,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     ViewDescription view =
@@ -187,7 +186,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ViewDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("513")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (513)),
                 readBuffer));
 
     int noOfNodeTypes = readImplicitField("noOfNodeTypes", readSignedInt(readBuffer, 32));
@@ -198,7 +197,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (NodeTypeDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("575")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (575)),
                 readBuffer),
             noOfNodeTypes);
 
@@ -207,8 +206,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "filter",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ContentFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("588")),
+                    (ContentFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (588)),
                 readBuffer));
 
     long maxDataSetsToReturn =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstResponse.java
index c2ff950f548..ddad18fd6f8 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryFirstResponse.java
@@ -38,8 +38,8 @@
 public class QueryFirstResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "618";
+  public Integer getExtensionId() {
+    return (int) 618;
   }
 
   // Properties.
@@ -197,7 +197,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryFirstResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -207,8 +207,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfQueryDataSets = readImplicitField("noOfQueryDataSets", readSignedInt(readBuffer, 32));
@@ -217,9 +216,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "queryDataSets",
             new DataReaderComplexDefault<>(
-                () ->
-                    (QueryDataSet)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("579")),
+                () -> (QueryDataSet) ExtensionObjectDefinition.staticParse(readBuffer, (int) (579)),
                 readBuffer),
             noOfQueryDataSets);
 
@@ -236,8 +233,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "parsingResults",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ParsingResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("612")),
+                    (ParsingResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (612)),
                 readBuffer),
             noOfParsingResults);
 
@@ -257,7 +253,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ContentFilterResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("609")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (609)),
                 readBuffer));
 
     readBuffer.closeContext("QueryFirstResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java
index 72579b162cd..d3ced82f7da 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java
@@ -38,8 +38,8 @@
 public class QueryNextRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "621";
+  public Integer getExtensionId() {
+    return (int) 621;
   }
 
   // Properties.
@@ -120,7 +120,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryNextRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -130,8 +130,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     Byte reservedField0 =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextResponse.java
index 5b08641e400..03292e3e30d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextResponse.java
@@ -38,8 +38,8 @@
 public class QueryNextResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "624";
+  public Integer getExtensionId() {
+    return (int) 624;
   }
 
   // Properties.
@@ -130,7 +130,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("QueryNextResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -140,8 +140,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfQueryDataSets = readImplicitField("noOfQueryDataSets", readSignedInt(readBuffer, 32));
@@ -150,9 +149,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "queryDataSets",
             new DataReaderComplexDefault<>(
-                () ->
-                    (QueryDataSet)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("579")),
+                () -> (QueryDataSet) ExtensionObjectDefinition.staticParse(readBuffer, (int) (579)),
                 readBuffer),
             noOfQueryDataSets);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Range.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Range.java
index 8f348095542..f58077e0cbc 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Range.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Range.java
@@ -38,8 +38,8 @@
 public class Range extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "886";
+  public Integer getExtensionId() {
+    return (int) 886;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Range");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RationalNumber.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RationalNumber.java
index 21f90ee7998..ec5e07e8941 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RationalNumber.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RationalNumber.java
@@ -38,8 +38,8 @@
 public class RationalNumber extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "18808";
+  public Integer getExtensionId() {
+    return (int) 18808;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RationalNumber");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAnnotationDataDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAnnotationDataDetails.java
index 963beb25411..7b0eed7ad88 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAnnotationDataDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAnnotationDataDetails.java
@@ -38,8 +38,8 @@
 public class ReadAnnotationDataDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23499";
+  public Integer getExtensionId() {
+    return (int) 23499;
   }
 
   // Properties.
@@ -95,7 +95,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadAnnotationDataDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAtTimeDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAtTimeDetails.java
index c27410fa185..75bbf688f4d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAtTimeDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadAtTimeDetails.java
@@ -38,8 +38,8 @@
 public class ReadAtTimeDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "655";
+  public Integer getExtensionId() {
+    return (int) 655;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadAtTimeDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails.java
index 98bca606d00..d0aafd33cce 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails.java
@@ -38,8 +38,8 @@
 public class ReadEventDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "646";
+  public Integer getExtensionId() {
+    return (int) 646;
   }
 
   // Properties.
@@ -121,7 +121,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadEventDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -136,9 +136,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "filter",
             new DataReaderComplexDefault<>(
-                () ->
-                    (EventFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("727")),
+                () -> (EventFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (727)),
                 readBuffer));
 
     readBuffer.closeContext("ReadEventDetails");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails2.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails2.java
index 714066373b9..f5602e56a58 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails2.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadEventDetails2.java
@@ -38,8 +38,8 @@
 public class ReadEventDetails2 extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32801";
+  public Integer getExtensionId() {
+    return (int) 32801;
   }
 
   // Properties.
@@ -144,7 +144,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadEventDetails2");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -159,9 +159,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "filter",
             new DataReaderComplexDefault<>(
-                () ->
-                    (EventFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("727")),
+                () -> (EventFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (727)),
                 readBuffer));
 
     Byte reservedField0 =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadProcessedDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadProcessedDetails.java
index 75612e26900..2092bfabbab 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadProcessedDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadProcessedDetails.java
@@ -38,8 +38,8 @@
 public class ReadProcessedDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "652";
+  public Integer getExtensionId() {
+    return (int) 652;
   }
 
   // Properties.
@@ -156,7 +156,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadProcessedDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -181,7 +181,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (AggregateConfiguration)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("950")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (950)),
                 readBuffer));
 
     readBuffer.closeContext("ReadProcessedDetails");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRawModifiedDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRawModifiedDetails.java
index cfdda19acac..060af402dd9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRawModifiedDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRawModifiedDetails.java
@@ -38,8 +38,8 @@
 public class ReadRawModifiedDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "649";
+  public Integer getExtensionId() {
+    return (int) 649;
   }
 
   // Properties.
@@ -150,7 +150,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadRawModifiedDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRequest.java
index efa9b24263a..1d04974712d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadRequest.java
@@ -38,8 +38,8 @@
 public class ReadRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "631";
+  public Integer getExtensionId() {
+    return (int) 631;
   }
 
   // Properties.
@@ -146,7 +146,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -156,8 +156,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     double maxAge = readSimpleField("maxAge", readDouble(readBuffer, 64));
@@ -175,9 +174,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "nodesToRead",
             new DataReaderComplexDefault<>(
-                () ->
-                    (ReadValueId)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("628")),
+                () -> (ReadValueId) ExtensionObjectDefinition.staticParse(readBuffer, (int) (628)),
                 readBuffer),
             noOfNodesToRead);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadResponse.java
index c61feb1fba3..3e973927908 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadResponse.java
@@ -38,8 +38,8 @@
 public class ReadResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "634";
+  public Integer getExtensionId() {
+    return (int) 634;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadValueId.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadValueId.java
index 652eaedf946..d25faada27e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadValueId.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReadValueId.java
@@ -38,8 +38,8 @@
 public class ReadValueId extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "628";
+  public Integer getExtensionId() {
+    return (int) 628;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReadValueId");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupDataType.java
index 1919d180d7c..a383b2a27fb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupDataType.java
@@ -38,8 +38,8 @@
 public class ReaderGroupDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15522";
+  public Integer getExtensionId() {
+    return (int) 15522;
   }
 
   // Properties.
@@ -266,7 +266,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReaderGroupDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -302,7 +302,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfSecurityKeyServices);
 
@@ -317,8 +317,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "groupProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfGroupProperties);
 
@@ -342,7 +341,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetReaderDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15625")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15625)),
                 readBuffer),
             noOfDataSetReaders);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupMessageDataType.java
index 9642dd0369a..8c80cdcd678 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupMessageDataType.java
@@ -38,8 +38,8 @@
 public class ReaderGroupMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15624";
+  public Integer getExtensionId() {
+    return (int) 15624;
   }
 
   public ReaderGroupMessageDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReaderGroupMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupTransportDataType.java
index 4ab34cc52c5..b4345803a9d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReaderGroupTransportDataType.java
@@ -38,8 +38,8 @@
 public class ReaderGroupTransportDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15623";
+  public Integer getExtensionId() {
+    return (int) 15623;
   }
 
   public ReaderGroupTransportDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReaderGroupTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosDataType.java
index d0e6792513f..b6fb3f4120f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosDataType.java
@@ -38,8 +38,8 @@
 public class ReceiveQosDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23610";
+  public Integer getExtensionId() {
+    return (int) 23610;
   }
 
   public ReceiveQosDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReceiveQosDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosPriorityDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosPriorityDataType.java
index 88df92e1bbf..41c5db860b0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosPriorityDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReceiveQosPriorityDataType.java
@@ -38,8 +38,8 @@
 public class ReceiveQosPriorityDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23611";
+  public Integer getExtensionId() {
+    return (int) 23611;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReceiveQosPriorityDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RedundantServerDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RedundantServerDataType.java
index 04c6a539737..d03acc902eb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RedundantServerDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RedundantServerDataType.java
@@ -38,8 +38,8 @@
 public class RedundantServerDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "855";
+  public Integer getExtensionId() {
+    return (int) 855;
   }
 
   // Properties.
@@ -115,7 +115,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RedundantServerDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java
index cf13ba5975a..7e18af8497d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java
@@ -38,8 +38,8 @@
 public class ReferenceDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "520";
+  public Integer getExtensionId() {
+    return (int) 520;
   }
 
   // Properties.
@@ -176,7 +176,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReferenceDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescriptionDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescriptionDataType.java
index 06041775b59..c6c08eeb2d1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescriptionDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescriptionDataType.java
@@ -38,8 +38,8 @@
 public class ReferenceDescriptionDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32661";
+  public Integer getExtensionId() {
+    return (int) 32661;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReferenceDescriptionDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceListEntryDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceListEntryDataType.java
index c2f52e5d0ef..02104d2830c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceListEntryDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceListEntryDataType.java
@@ -38,8 +38,8 @@
 public class ReferenceListEntryDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32662";
+  public Integer getExtensionId() {
+    return (int) 32662;
   }
 
   // Properties.
@@ -116,7 +116,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReferenceListEntryDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceTypeAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceTypeAttributes.java
index 23d3716df07..bdee1f31397 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceTypeAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceTypeAttributes.java
@@ -38,8 +38,8 @@
 public class ReferenceTypeAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "369";
+  public Integer getExtensionId() {
+    return (int) 369;
   }
 
   // Properties.
@@ -184,7 +184,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ReferenceTypeAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesRequest.java
index cf57a41c50a..24391a157d9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesRequest.java
@@ -38,8 +38,8 @@
 public class RegisterNodesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "560";
+  public Integer getExtensionId() {
+    return (int) 560;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterNodesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -122,8 +122,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfNodesToRegister =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesResponse.java
index ccd31103cf2..2ab38f2bfd2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterNodesResponse.java
@@ -38,8 +38,8 @@
 public class RegisterNodesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "563";
+  public Integer getExtensionId() {
+    return (int) 563;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterNodesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -123,8 +123,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfRegisteredNodeIds =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Request.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Request.java
index 6af8f5a6b88..2904a78b0df 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Request.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Request.java
@@ -38,8 +38,8 @@
 public class RegisterServer2Request extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12195";
+  public Integer getExtensionId() {
+    return (int) 12195;
   }
 
   // Properties.
@@ -131,7 +131,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterServer2Request");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -141,8 +141,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     RegisteredServer server =
@@ -151,7 +150,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (RegisteredServer)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("434")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (434)),
                 readBuffer));
 
     int noOfDiscoveryConfiguration =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Response.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Response.java
index df2ff976142..a3a2b211bf6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Response.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServer2Response.java
@@ -38,8 +38,8 @@
 public class RegisterServer2Response extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12196";
+  public Integer getExtensionId() {
+    return (int) 12196;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterServer2Response");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -153,8 +153,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfConfigurationResults =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerRequest.java
index 14ec3492dc2..a534a627761 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerRequest.java
@@ -38,8 +38,8 @@
 public class RegisterServerRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "437";
+  public Integer getExtensionId() {
+    return (int) 437;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterServerRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -107,8 +107,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     RegisteredServer server =
@@ -117,7 +116,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (RegisteredServer)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("434")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (434)),
                 readBuffer));
 
     readBuffer.closeContext("RegisterServerRequest");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerResponse.java
index eb568905b59..1900d17c445 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisterServerResponse.java
@@ -38,8 +38,8 @@
 public class RegisterServerResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "440";
+  public Integer getExtensionId() {
+    return (int) 440;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisterServerResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     readBuffer.closeContext("RegisterServerResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java
index f3acf8dded3..aeb35bdb537 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java
@@ -38,8 +38,8 @@
 public class RegisteredServer extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "434";
+  public Integer getExtensionId() {
+    return (int) 434;
   }
 
   // Properties.
@@ -219,7 +219,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RegisteredServer");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePath.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePath.java
index deff02c82e5..160b5c697af 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePath.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePath.java
@@ -38,8 +38,8 @@
 public class RelativePath extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "542";
+  public Integer getExtensionId() {
+    return (int) 542;
   }
 
   // Properties.
@@ -99,7 +99,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RelativePath");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -112,7 +112,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (RelativePathElement)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("539")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (539)),
                 readBuffer),
             noOfElements);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java
index 345fe3b820a..b141da72461 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java
@@ -38,8 +38,8 @@
 public class RelativePathElement extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "539";
+  public Integer getExtensionId() {
+    return (int) 539;
   }
 
   // Properties.
@@ -132,7 +132,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RelativePathElement");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishRequest.java
index ec68c7283d9..f4982968345 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishRequest.java
@@ -38,8 +38,8 @@
 public class RepublishRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "832";
+  public Integer getExtensionId() {
+    return (int) 832;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RepublishRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -121,8 +121,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishResponse.java
index ff6ed5336c8..b2f94fdbb3c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RepublishResponse.java
@@ -38,8 +38,8 @@
 public class RepublishResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "835";
+  public Integer getExtensionId() {
+    return (int) 835;
   }
 
   // Properties.
@@ -98,7 +98,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RepublishResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -108,8 +108,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     NotificationMessage notificationMessage =
@@ -118,7 +117,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (NotificationMessage)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("805")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (805)),
                 readBuffer));
 
     readBuffer.closeContext("RepublishResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RequestHeader.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RequestHeader.java
index 7c449283120..3246fbb53b3 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RequestHeader.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RequestHeader.java
@@ -38,8 +38,8 @@
 public class RequestHeader extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "391";
+  public Integer getExtensionId() {
+    return (int) 391;
   }
 
   // Properties.
@@ -166,7 +166,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RequestHeader");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ResponseHeader.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ResponseHeader.java
index 17e2856b423..e9b735f31bb 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ResponseHeader.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ResponseHeader.java
@@ -38,8 +38,8 @@
 public class ResponseHeader extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "394";
+  public Integer getExtensionId() {
+    return (int) 394;
   }
 
   // Properties.
@@ -167,7 +167,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ResponseHeader");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RolePermissionType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RolePermissionType.java
index 39f54ec4db9..f0d240df32b 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RolePermissionType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RolePermissionType.java
@@ -38,8 +38,8 @@
 public class RolePermissionType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "98";
+  public Integer getExtensionId() {
+    return (int) 98;
   }
 
   // Properties.
@@ -102,7 +102,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("RolePermissionType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RootExtensionObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RootExtensionObject.java
new file mode 100644
index 00000000000..f7ea7a84c4b
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RootExtensionObject.java
@@ -0,0 +1,147 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public class RootExtensionObject extends ExtensionObject implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getIncludeEncodingMask() {
+    return (boolean) false;
+  }
+
+  // Properties.
+  protected final ExtensionObjectDefinition body;
+
+  public RootExtensionObject(ExpandedNodeId typeId, ExtensionObjectDefinition body) {
+    super(typeId);
+    this.body = body;
+  }
+
+  public ExtensionObjectDefinition getBody() {
+    return body;
+  }
+
+  @Override
+  protected void serializeExtensionObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("RootExtensionObject");
+
+    // Simple Field (body)
+    writeSimpleField("body", body, new DataWriterComplexDefault<>(writeBuffer));
+
+    writeBuffer.popContext("RootExtensionObject");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    RootExtensionObject _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Simple field (body)
+    lengthInBits += body.getLengthInBits();
+
+    return lengthInBits;
+  }
+
+  public static ExtensionObjectBuilder staticParseExtensionObjectBuilder(
+      ReadBuffer readBuffer, Integer extensionId, Boolean includeEncodingMask)
+      throws ParseException {
+    readBuffer.pullContext("RootExtensionObject");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    ExtensionObjectDefinition body =
+        readSimpleField(
+            "body",
+            new DataReaderComplexDefault<>(
+                () -> ExtensionObjectDefinition.staticParse(readBuffer, (int) (extensionId)),
+                readBuffer));
+
+    readBuffer.closeContext("RootExtensionObject");
+    // Create the instance
+    return new RootExtensionObjectBuilderImpl(body);
+  }
+
+  public static class RootExtensionObjectBuilderImpl
+      implements ExtensionObject.ExtensionObjectBuilder {
+    private final ExtensionObjectDefinition body;
+
+    public RootExtensionObjectBuilderImpl(ExtensionObjectDefinition body) {
+      this.body = body;
+    }
+
+    public RootExtensionObject build(ExpandedNodeId typeId) {
+      RootExtensionObject rootExtensionObject = new RootExtensionObject(typeId, body);
+      return rootExtensionObject;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof RootExtensionObject)) {
+      return false;
+    }
+    RootExtensionObject that = (RootExtensionObject) o;
+    return (getBody() == that.getBody()) && super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), getBody());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SamplingIntervalDiagnosticsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SamplingIntervalDiagnosticsDataType.java
index 1b2d05dd09f..d17ea25282f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SamplingIntervalDiagnosticsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SamplingIntervalDiagnosticsDataType.java
@@ -39,8 +39,8 @@ public class SamplingIntervalDiagnosticsDataType extends ExtensionObjectDefiniti
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "858";
+  public Integer getExtensionId() {
+    return (int) 858;
   }
 
   // Properties.
@@ -130,7 +130,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SamplingIntervalDiagnosticsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SecurityGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SecurityGroupDataType.java
index a1c0b4327e7..3e61f50ed02 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SecurityGroupDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SecurityGroupDataType.java
@@ -38,8 +38,8 @@
 public class SecurityGroupDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23603";
+  public Integer getExtensionId() {
+    return (int) 23603;
   }
 
   // Properties.
@@ -238,7 +238,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SecurityGroupDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -282,7 +282,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (RolePermissionType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("98")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (98)),
                 readBuffer),
             noOfRolePermissions);
 
@@ -294,8 +294,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "groupProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfGroupProperties);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SemanticChangeStructureDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SemanticChangeStructureDataType.java
index e8604d52a29..f3ac68053a9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SemanticChangeStructureDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SemanticChangeStructureDataType.java
@@ -38,8 +38,8 @@
 public class SemanticChangeStructureDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "899";
+  public Integer getExtensionId() {
+    return (int) 899;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SemanticChangeStructureDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerDiagnosticsSummaryDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerDiagnosticsSummaryDataType.java
index ac1a9473445..8c86bb4e590 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerDiagnosticsSummaryDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerDiagnosticsSummaryDataType.java
@@ -38,8 +38,8 @@
 public class ServerDiagnosticsSummaryDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "861";
+  public Integer getExtensionId() {
+    return (int) 861;
   }
 
   // Properties.
@@ -245,7 +245,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ServerDiagnosticsSummaryDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerOnNetwork.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerOnNetwork.java
index 6e1a5da395c..a6f018f07c2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerOnNetwork.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerOnNetwork.java
@@ -38,8 +38,8 @@
 public class ServerOnNetwork extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12191";
+  public Integer getExtensionId() {
+    return (int) 12191;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ServerOnNetwork");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerStatusDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerStatusDataType.java
index 3f435b62be2..34f6ffb0f71 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerStatusDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServerStatusDataType.java
@@ -38,8 +38,8 @@
 public class ServerStatusDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "864";
+  public Integer getExtensionId() {
+    return (int) 864;
   }
 
   // Properties.
@@ -157,7 +157,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ServerStatusDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -177,8 +177,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "buildInfo",
             new DataReaderComplexDefault<>(
-                () ->
-                    (BuildInfo) ExtensionObjectDefinition.staticParse(readBuffer, (String) ("340")),
+                () -> (BuildInfo) ExtensionObjectDefinition.staticParse(readBuffer, (int) (340)),
                 readBuffer));
 
     long secondsTillShutdown =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceCounterDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceCounterDataType.java
index dc2a77a7397..cf86146fb8d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceCounterDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceCounterDataType.java
@@ -38,8 +38,8 @@
 public class ServiceCounterDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "873";
+  public Integer getExtensionId() {
+    return (int) 873;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ServiceCounterDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceFault.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceFault.java
index f0c423f05be..c9cdcfc1167 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceFault.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ServiceFault.java
@@ -38,8 +38,8 @@
 public class ServiceFault extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "397";
+  public Integer getExtensionId() {
+    return (int) 397;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ServiceFault");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     readBuffer.closeContext("ServiceFault");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionDiagnosticsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionDiagnosticsDataType.java
index c0365e2e16b..28a6dc8c7db 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionDiagnosticsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionDiagnosticsDataType.java
@@ -38,8 +38,8 @@
 public class SessionDiagnosticsDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "867";
+  public Integer getExtensionId() {
+    return (int) 867;
   }
 
   // Properties.
@@ -701,7 +701,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SessionDiagnosticsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -722,7 +722,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ApplicationDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("310")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (310)),
                 readBuffer));
 
     PascalString serverUri =
@@ -770,7 +770,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     long unauthorizedRequestCount =
@@ -782,7 +782,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType historyReadCount =
@@ -791,7 +791,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType writeCount =
@@ -800,7 +800,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType historyUpdateCount =
@@ -809,7 +809,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType callCount =
@@ -818,7 +818,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType createMonitoredItemsCount =
@@ -827,7 +827,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType modifyMonitoredItemsCount =
@@ -836,7 +836,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType setMonitoringModeCount =
@@ -845,7 +845,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType setTriggeringCount =
@@ -854,7 +854,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType deleteMonitoredItemsCount =
@@ -863,7 +863,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType createSubscriptionCount =
@@ -872,7 +872,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType modifySubscriptionCount =
@@ -881,7 +881,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType setPublishingModeCount =
@@ -890,7 +890,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType publishCount =
@@ -899,7 +899,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType republishCount =
@@ -908,7 +908,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType transferSubscriptionsCount =
@@ -917,7 +917,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType deleteSubscriptionsCount =
@@ -926,7 +926,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType addNodesCount =
@@ -935,7 +935,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType addReferencesCount =
@@ -944,7 +944,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType deleteNodesCount =
@@ -953,7 +953,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType deleteReferencesCount =
@@ -962,7 +962,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType browseCount =
@@ -971,7 +971,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType browseNextCount =
@@ -980,7 +980,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType translateBrowsePathsToNodeIdsCount =
@@ -989,7 +989,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType queryFirstCount =
@@ -998,7 +998,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType queryNextCount =
@@ -1007,7 +1007,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType registerNodesCount =
@@ -1016,7 +1016,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     ServiceCounterDataType unregisterNodesCount =
@@ -1025,7 +1025,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (ServiceCounterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("873")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (873)),
                 readBuffer));
 
     readBuffer.closeContext("SessionDiagnosticsDataType");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionSecurityDiagnosticsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionSecurityDiagnosticsDataType.java
index 25cbf2d242a..7b160106db5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionSecurityDiagnosticsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionSecurityDiagnosticsDataType.java
@@ -39,8 +39,8 @@ public class SessionSecurityDiagnosticsDataType extends ExtensionObjectDefinitio
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "870";
+  public Integer getExtensionId() {
+    return (int) 870;
   }
 
   // Properties.
@@ -223,7 +223,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SessionSecurityDiagnosticsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeRequestType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeRequestType.java
index 5db87e0d824..2fcf7bec8f2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeRequestType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeRequestType.java
@@ -38,8 +38,8 @@
 public class SessionlessInvokeRequestType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15903";
+  public Integer getExtensionId() {
+    return (int) 15903;
   }
 
   // Properties.
@@ -181,7 +181,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SessionlessInvokeRequestType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeResponseType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeResponseType.java
index 0b2540c4d7e..68492997654 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeResponseType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SessionlessInvokeResponseType.java
@@ -38,8 +38,8 @@
 public class SessionlessInvokeResponseType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "21001";
+  public Integer getExtensionId() {
+    return (int) 21001;
   }
 
   // Properties.
@@ -139,7 +139,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SessionlessInvokeResponseType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeRequest.java
index 55a1f205541..63b7b213f5a 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeRequest.java
@@ -38,8 +38,8 @@
 public class SetMonitoringModeRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "769";
+  public Integer getExtensionId() {
+    return (int) 769;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetMonitoringModeRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -153,8 +153,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeResponse.java
index c008568ca80..f6c408692f6 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetMonitoringModeResponse.java
@@ -38,8 +38,8 @@
 public class SetMonitoringModeResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "772";
+  public Integer getExtensionId() {
+    return (int) 772;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetMonitoringModeResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java
index 3f3f15d34ac..4145d2622d5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java
@@ -38,8 +38,8 @@
 public class SetPublishingModeRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "799";
+  public Integer getExtensionId() {
+    return (int) 799;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetPublishingModeRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -138,8 +138,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     Byte reservedField0 =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeResponse.java
index 6628fcccea5..ecc097beb97 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeResponse.java
@@ -38,8 +38,8 @@
 public class SetPublishingModeResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "802";
+  public Integer getExtensionId() {
+    return (int) 802;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetPublishingModeResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringRequest.java
index 9515aae37bd..3410f6d9ce9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringRequest.java
@@ -38,8 +38,8 @@
 public class SetTriggeringRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "775";
+  public Integer getExtensionId() {
+    return (int) 775;
   }
 
   // Properties.
@@ -159,7 +159,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetTriggeringRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -169,8 +169,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     long subscriptionId = readSimpleField("subscriptionId", readUnsignedLong(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringResponse.java
index 4694040cbf0..5f25563e655 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetTriggeringResponse.java
@@ -38,8 +38,8 @@
 public class SetTriggeringResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "778";
+  public Integer getExtensionId() {
+    return (int) 778;
   }
 
   // Properties.
@@ -200,7 +200,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SetTriggeringResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -210,8 +210,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfAddResults = readImplicitField("noOfAddResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignatureData.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignatureData.java
index 4f20304e3fd..f01a6d4d7a7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignatureData.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignatureData.java
@@ -38,8 +38,8 @@
 public class SignatureData extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "458";
+  public Integer getExtensionId() {
+    return (int) 458;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SignatureData");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignedSoftwareCertificate.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignedSoftwareCertificate.java
index 41fa1a992ba..ebb863c6687 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignedSoftwareCertificate.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SignedSoftwareCertificate.java
@@ -38,8 +38,8 @@
 public class SignedSoftwareCertificate extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "346";
+  public Integer getExtensionId() {
+    return (int) 346;
   }
 
   // Properties.
@@ -98,7 +98,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SignedSoftwareCertificate");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleAttributeOperand.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleAttributeOperand.java
index aba21755703..92ddd63d7a0 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleAttributeOperand.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleAttributeOperand.java
@@ -38,8 +38,8 @@
 public class SimpleAttributeOperand extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "603";
+  public Integer getExtensionId() {
+    return (int) 603;
   }
 
   // Properties.
@@ -140,7 +140,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SimpleAttributeOperand");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleTypeDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleTypeDescription.java
index 0d476e84b7b..8bc816c94fe 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleTypeDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SimpleTypeDescription.java
@@ -38,8 +38,8 @@
 public class SimpleTypeDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15007";
+  public Integer getExtensionId() {
+    return (int) 15007;
   }
 
   // Properties.
@@ -122,7 +122,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SimpleTypeDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetDataType.java
index 617e02049a1..1226354a37f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetDataType.java
@@ -39,8 +39,8 @@ public class StandaloneSubscribedDataSetDataType extends ExtensionObjectDefiniti
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23602";
+  public Integer getExtensionId() {
+    return (int) 23602;
   }
 
   // Properties.
@@ -143,7 +143,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StandaloneSubscribedDataSetDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -167,7 +167,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetMetaDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14525")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14525)),
                 readBuffer));
 
     ExtensionObject subscribedDataSet =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetRefDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetRefDataType.java
index 1fd263ec95c..0c4ab2f4182 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetRefDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StandaloneSubscribedDataSetRefDataType.java
@@ -39,8 +39,8 @@ public class StandaloneSubscribedDataSetRefDataType extends ExtensionObjectDefin
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23601";
+  public Integer getExtensionId() {
+    return (int) 23601;
   }
 
   // Properties.
@@ -86,7 +86,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StandaloneSubscribedDataSetRefDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusChangeNotification.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusChangeNotification.java
index f154c845e38..151528557de 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusChangeNotification.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusChangeNotification.java
@@ -38,8 +38,8 @@
 public class StatusChangeNotification extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "820";
+  public Integer getExtensionId() {
+    return (int) 820;
   }
 
   // Properties.
@@ -67,11 +67,6 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer)
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
     writeBuffer.pushContext("StatusChangeNotification");
 
-    // Implicit Field (size) (Used for parsing, but its value is not stored as it's implicitly given
-    // by the objects content)
-    int size = (int) ((getLengthInBytes()) - (4));
-    writeImplicitField("size", size, writeSignedInt(writeBuffer, 32));
-
     // Simple Field (status)
     writeSimpleField("status", status, new DataWriterComplexDefault<>(writeBuffer));
 
@@ -92,9 +87,6 @@ public int getLengthInBits() {
     StatusChangeNotification _value = this;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    // Implicit Field (size)
-    lengthInBits += 32;
-
     // Simple field (status)
     lengthInBits += status.getLengthInBits();
 
@@ -105,13 +97,11 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StatusChangeNotification");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
-    int size = readImplicitField("size", readSignedInt(readBuffer, 32));
-
     StatusCode status =
         readSimpleField(
             "status",
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusResult.java
index fc2879deefc..a70d1e2bdc9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StatusResult.java
@@ -38,8 +38,8 @@
 public class StatusResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "301";
+  public Integer getExtensionId() {
+    return (int) 301;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StatusResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDefinition.java
index 2ea39f56b7f..1847e7cabe7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDefinition.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDefinition.java
@@ -38,8 +38,8 @@
 public class StructureDefinition extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "101";
+  public Integer getExtensionId() {
+    return (int) 101;
   }
 
   // Properties.
@@ -145,7 +145,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StructureDefinition");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -174,8 +174,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "fields",
             new DataReaderComplexDefault<>(
                 () ->
-                    (StructureField)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("103")),
+                    (StructureField) ExtensionObjectDefinition.staticParse(readBuffer, (int) (103)),
                 readBuffer),
             noOfFields);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDescription.java
index 0e57c4f926a..4ef4b0feefe 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureDescription.java
@@ -38,8 +38,8 @@
 public class StructureDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15489";
+  public Integer getExtensionId() {
+    return (int) 15489;
   }
 
   // Properties.
@@ -111,7 +111,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StructureDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -133,7 +133,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (StructureDefinition)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("101")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (101)),
                 readBuffer));
 
     readBuffer.closeContext("StructureDescription");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java
index 26801d899aa..e29e34c9ee9 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java
@@ -38,8 +38,8 @@
 public class StructureField extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "103";
+  public Integer getExtensionId() {
+    return (int) 103;
   }
 
   // Properties.
@@ -182,7 +182,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("StructureField");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetDataType.java
index 44b312c1ae3..971b426ed92 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetDataType.java
@@ -38,8 +38,8 @@
 public class SubscribedDataSetDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15632";
+  public Integer getExtensionId() {
+    return (int) 15632;
   }
 
   public SubscribedDataSetDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SubscribedDataSetDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetMirrorDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetMirrorDataType.java
index 2d559819720..db6a4342e02 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetMirrorDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscribedDataSetMirrorDataType.java
@@ -38,8 +38,8 @@
 public class SubscribedDataSetMirrorDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15637";
+  public Integer getExtensionId() {
+    return (int) 15637;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SubscribedDataSetMirrorDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -132,7 +132,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (RolePermissionType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("98")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (98)),
                 readBuffer),
             noOfRolePermissions);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionAcknowledgement.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionAcknowledgement.java
index b07712aa757..01e8883e3d2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionAcknowledgement.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionAcknowledgement.java
@@ -38,8 +38,8 @@
 public class SubscriptionAcknowledgement extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "823";
+  public Integer getExtensionId() {
+    return (int) 823;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SubscriptionAcknowledgement");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java
index 02a63e14c35..68df6114458 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java
@@ -38,8 +38,8 @@
 public class SubscriptionDiagnosticsDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "876";
+  public Integer getExtensionId() {
+    return (int) 876;
   }
 
   // Properties.
@@ -516,7 +516,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("SubscriptionDiagnosticsDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TargetVariablesDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TargetVariablesDataType.java
index 329967dd6c7..d84a3a23e69 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TargetVariablesDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TargetVariablesDataType.java
@@ -38,8 +38,8 @@
 public class TargetVariablesDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15633";
+  public Integer getExtensionId() {
+    return (int) 15633;
   }
 
   // Properties.
@@ -100,7 +100,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TargetVariablesDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -114,7 +114,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (FieldTargetDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14746")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (14746)),
                 readBuffer),
             noOfTargetVariables);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java
index 9c4937c58af..9a0730a3868 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java
@@ -38,8 +38,8 @@
 public class TimeZoneDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "8914";
+  public Integer getExtensionId() {
+    return (int) 8914;
   }
 
   // Properties.
@@ -103,7 +103,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TimeZoneDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransactionErrorType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransactionErrorType.java
index fdf43ef6235..6f0a2711474 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransactionErrorType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransactionErrorType.java
@@ -38,8 +38,8 @@
 public class TransactionErrorType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "32287";
+  public Integer getExtensionId() {
+    return (int) 32287;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransactionErrorType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferResult.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferResult.java
index 307c6444ace..d4c246b3684 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferResult.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferResult.java
@@ -38,8 +38,8 @@
 public class TransferResult extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "838";
+  public Integer getExtensionId() {
+    return (int) 838;
   }
 
   // Properties.
@@ -115,7 +115,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransferResult");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java
index 944337016a6..5452373e5b3 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java
@@ -38,8 +38,8 @@
 public class TransferSubscriptionsRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "841";
+  public Integer getExtensionId() {
+    return (int) 841;
   }
 
   // Properties.
@@ -128,7 +128,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransferSubscriptionsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -138,8 +138,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfSubscriptionIds =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsResponse.java
index 159b5d1ec61..2d5e9a44038 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsResponse.java
@@ -38,8 +38,8 @@
 public class TransferSubscriptionsResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "844";
+  public Integer getExtensionId() {
+    return (int) 844;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransferSubscriptionsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -162,8 +161,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "results",
             new DataReaderComplexDefault<>(
                 () ->
-                    (TransferResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("838")),
+                    (TransferResult) ExtensionObjectDefinition.staticParse(readBuffer, (int) (838)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsRequest.java
index beecc3e4f37..9023aa9fc04 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsRequest.java
@@ -39,8 +39,8 @@ public class TranslateBrowsePathsToNodeIdsRequest extends ExtensionObjectDefinit
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "554";
+  public Integer getExtensionId() {
+    return (int) 554;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TranslateBrowsePathsToNodeIdsRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -123,8 +123,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfBrowsePaths = readImplicitField("noOfBrowsePaths", readSignedInt(readBuffer, 32));
@@ -133,9 +132,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "browsePaths",
             new DataReaderComplexDefault<>(
-                () ->
-                    (BrowsePath)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("545")),
+                () -> (BrowsePath) ExtensionObjectDefinition.staticParse(readBuffer, (int) (545)),
                 readBuffer),
             noOfBrowsePaths);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsResponse.java
index 8fb760fd6d2..c4fa2d03de3 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TranslateBrowsePathsToNodeIdsResponse.java
@@ -39,8 +39,8 @@ public class TranslateBrowsePathsToNodeIdsResponse extends ExtensionObjectDefini
     implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "557";
+  public Integer getExtensionId() {
+    return (int) 557;
   }
 
   // Properties.
@@ -142,7 +142,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TranslateBrowsePathsToNodeIdsResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -152,8 +152,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
@@ -164,7 +163,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (BrowsePathResult)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("551")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (551)),
                 readBuffer),
             noOfResults);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosDataType.java
index abe9d183e42..aa44c80b6ae 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosDataType.java
@@ -38,8 +38,8 @@
 public class TransmitQosDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23606";
+  public Integer getExtensionId() {
+    return (int) 23606;
   }
 
   public TransmitQosDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransmitQosDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosPriorityDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosPriorityDataType.java
index 6367637b0ae..96bcec7fe08 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosPriorityDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransmitQosPriorityDataType.java
@@ -38,8 +38,8 @@
 public class TransmitQosPriorityDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "23607";
+  public Integer getExtensionId() {
+    return (int) 23607;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TransmitQosPriorityDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TrustListDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TrustListDataType.java
index b19bdeec103..7f8ef199c84 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TrustListDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TrustListDataType.java
@@ -38,8 +38,8 @@
 public class TrustListDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12556";
+  public Integer getExtensionId() {
+    return (int) 12556;
   }
 
   // Properties.
@@ -198,7 +198,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("TrustListDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UABinaryFileDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UABinaryFileDataType.java
index 9b987021eba..441f046afff 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UABinaryFileDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UABinaryFileDataType.java
@@ -38,8 +38,8 @@
 public class UABinaryFileDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15008";
+  public Integer getExtensionId() {
+    return (int) 15008;
   }
 
   // Properties.
@@ -238,7 +238,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UABinaryFileDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -260,7 +260,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (StructureDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15489")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15489)),
                 readBuffer),
             noOfStructureDataTypes);
 
@@ -272,7 +272,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EnumDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15490")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15490)),
                 readBuffer),
             noOfEnumDataTypes);
 
@@ -285,7 +285,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (SimpleTypeDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15007")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15007)),
                 readBuffer),
             noOfSimpleDataTypes);
 
@@ -301,8 +301,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "fileHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfFileHeader);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetReaderMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetReaderMessageDataType.java
index 7eae190217b..74ab24302ae 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetReaderMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetReaderMessageDataType.java
@@ -38,8 +38,8 @@
 public class UadpDataSetReaderMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15655";
+  public Integer getExtensionId() {
+    return (int) 15655;
   }
 
   // Properties.
@@ -205,7 +205,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UadpDataSetReaderMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetWriterMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetWriterMessageDataType.java
index f1296f1073a..8f57d9901e2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetWriterMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpDataSetWriterMessageDataType.java
@@ -38,8 +38,8 @@
 public class UadpDataSetWriterMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15654";
+  public Integer getExtensionId() {
+    return (int) 15654;
   }
 
   // Properties.
@@ -133,7 +133,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UadpDataSetWriterMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpWriterGroupMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpWriterGroupMessageDataType.java
index 917e833ab3e..37138927ff5 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpWriterGroupMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UadpWriterGroupMessageDataType.java
@@ -38,8 +38,8 @@
 public class UadpWriterGroupMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15647";
+  public Integer getExtensionId() {
+    return (int) 15647;
   }
 
   // Properties.
@@ -164,7 +164,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UadpWriterGroupMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Union.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Union.java
index e199a63c14a..441a2647946 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Union.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Union.java
@@ -38,8 +38,8 @@
 public class Union extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12758";
+  public Integer getExtensionId() {
+    return (int) 12758;
   }
 
   public Union() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("Union");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesRequest.java
index 0bf5a24316d..4e8c8749069 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesRequest.java
@@ -38,8 +38,8 @@
 public class UnregisterNodesRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "566";
+  public Integer getExtensionId() {
+    return (int) 566;
   }
 
   // Properties.
@@ -113,7 +113,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UnregisterNodesRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -123,8 +123,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfNodesToUnregister =
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesResponse.java
index 51e480116a5..7ef8409fb57 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnregisterNodesResponse.java
@@ -38,8 +38,8 @@
 public class UnregisterNodesResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "569";
+  public Integer getExtensionId() {
+    return (int) 569;
   }
 
   // Properties.
@@ -85,7 +85,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UnregisterNodesResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -95,8 +95,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     readBuffer.closeContext("UnregisterNodesResponse");
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnsignedRationalNumber.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnsignedRationalNumber.java
index 53db4159c0a..983ff43eae2 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnsignedRationalNumber.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UnsignedRationalNumber.java
@@ -38,8 +38,8 @@
 public class UnsignedRationalNumber extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "24109";
+  public Integer getExtensionId() {
+    return (int) 24109;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UnsignedRationalNumber");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateDataDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateDataDetails.java
index 7425cdc36c2..3367c8b7645 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateDataDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateDataDetails.java
@@ -38,8 +38,8 @@
 public class UpdateDataDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "682";
+  public Integer getExtensionId() {
+    return (int) 682;
   }
 
   // Properties.
@@ -132,7 +132,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UpdateDataDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateEventDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateEventDetails.java
index 7590bbdc3ed..f399e5610c1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateEventDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateEventDetails.java
@@ -38,8 +38,8 @@
 public class UpdateEventDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "685";
+  public Integer getExtensionId() {
+    return (int) 685;
   }
 
   // Properties.
@@ -146,7 +146,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UpdateEventDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -167,9 +167,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readSimpleField(
             "filter",
             new DataReaderComplexDefault<>(
-                () ->
-                    (EventFilter)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("727")),
+                () -> (EventFilter) ExtensionObjectDefinition.staticParse(readBuffer, (int) (727)),
                 readBuffer));
 
     int noOfEventData = readImplicitField("noOfEventData", readSignedInt(readBuffer, 32));
@@ -180,7 +178,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (HistoryEventFieldList)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("922")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (922)),
                 readBuffer),
             noOfEventData);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateStructureDataDetails.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateStructureDataDetails.java
index 92164ad0492..d92717c67ab 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateStructureDataDetails.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UpdateStructureDataDetails.java
@@ -38,8 +38,8 @@
 public class UpdateStructureDataDetails extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "11297";
+  public Integer getExtensionId() {
+    return (int) 11297;
   }
 
   // Properties.
@@ -132,7 +132,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UpdateStructureDataDetails");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserIdentityToken.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserIdentityToken.java
index 611047e5c6f..217290b0f10 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserIdentityToken.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserIdentityToken.java
@@ -38,8 +38,8 @@
 public class UserIdentityToken extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "316";
+  public Integer getExtensionId() {
+    return (int) 316;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UserIdentityToken");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserManagementDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserManagementDataType.java
index f2efad131a6..892eb30163f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserManagementDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserManagementDataType.java
@@ -38,8 +38,8 @@
 public class UserManagementDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "24283";
+  public Integer getExtensionId() {
+    return (int) 24283;
   }
 
   // Properties.
@@ -117,7 +117,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UserManagementDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserTokenPolicy.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserTokenPolicy.java
index ecaa0d9696f..377cc19b31c 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserTokenPolicy.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/UserTokenPolicy.java
@@ -38,8 +38,8 @@
 public class UserTokenPolicy extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "306";
+  public Integer getExtensionId() {
+    return (int) 306;
   }
 
   // Properties.
@@ -146,7 +146,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("UserTokenPolicy");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableAttributes.java
index a396977358c..ea079aeeb9d 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableAttributes.java
@@ -38,8 +38,8 @@
 public class VariableAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "357";
+  public Integer getExtensionId() {
+    return (int) 357;
   }
 
   // Properties.
@@ -262,7 +262,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("VariableAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableTypeAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableTypeAttributes.java
index d8937c79b89..120daf1199f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableTypeAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariableTypeAttributes.java
@@ -38,8 +38,8 @@
 public class VariableTypeAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "366";
+  public Integer getExtensionId() {
+    return (int) 366;
   }
 
   // Properties.
@@ -222,7 +222,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("VariableTypeAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewAttributes.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewAttributes.java
index 9c408229288..384a54f73c7 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewAttributes.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewAttributes.java
@@ -38,8 +38,8 @@
 public class ViewAttributes extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "375";
+  public Integer getExtensionId() {
+    return (int) 375;
   }
 
   // Properties.
@@ -171,7 +171,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ViewAttributes");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewDescription.java
index 99188274869..cc5b4b1da5f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewDescription.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ViewDescription.java
@@ -38,8 +38,8 @@
 public class ViewDescription extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "513";
+  public Integer getExtensionId() {
+    return (int) 513;
   }
 
   // Properties.
@@ -109,7 +109,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("ViewDescription");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WireExtensionObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WireExtensionObject.java
new file mode 100644
index 00000000000..117f76eec40
--- /dev/null
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WireExtensionObject.java
@@ -0,0 +1,188 @@
+/*
+ * 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
+ *
+ *   https://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 org.apache.plc4x.java.opcua.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public class WireExtensionObject extends ExtensionObject implements Message {
+
+  // Accessors for discriminator values.
+  public Boolean getIncludeEncodingMask() {
+    return (boolean) true;
+  }
+
+  // Properties.
+  protected final ExtensionObjectEncodingMask encodingMask;
+  protected final EncodedObject data;
+
+  public WireExtensionObject(
+      ExpandedNodeId typeId, ExtensionObjectEncodingMask encodingMask, EncodedObject data) {
+    super(typeId);
+    this.encodingMask = encodingMask;
+    this.data = data;
+  }
+
+  public ExtensionObjectEncodingMask getEncodingMask() {
+    return encodingMask;
+  }
+
+  public EncodedObject getData() {
+    return data;
+  }
+
+  public ExtensionObjectDefinition getBody() {
+    return (ExtensionObjectDefinition) (getData().getBody());
+  }
+
+  @Override
+  protected void serializeExtensionObjectChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("WireExtensionObject");
+
+    // Simple Field (encodingMask)
+    writeSimpleField("encodingMask", encodingMask, new DataWriterComplexDefault<>(writeBuffer));
+
+    // Simple Field (data)
+    writeSimpleField("data", data, new DataWriterComplexDefault<>(writeBuffer));
+
+    // Virtual field (doesn't actually serialize anything, just makes the value available)
+    ExtensionObjectDefinition body = getBody();
+    writeBuffer.writeVirtual("body", body);
+
+    writeBuffer.popContext("WireExtensionObject");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    WireExtensionObject _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    // Simple field (encodingMask)
+    lengthInBits += encodingMask.getLengthInBits();
+
+    // Simple field (data)
+    lengthInBits += data.getLengthInBits();
+
+    // A virtual field doesn't have any in- or output.
+
+    return lengthInBits;
+  }
+
+  public static ExtensionObjectBuilder staticParseExtensionObjectBuilder(
+      ReadBuffer readBuffer, Integer extensionId, Boolean includeEncodingMask)
+      throws ParseException {
+    readBuffer.pullContext("WireExtensionObject");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    ExtensionObjectEncodingMask encodingMask =
+        readSimpleField(
+            "encodingMask",
+            new DataReaderComplexDefault<>(
+                () -> ExtensionObjectEncodingMask.staticParse(readBuffer), readBuffer));
+
+    EncodedObject data =
+        readSimpleField(
+            "data",
+            new DataReaderComplexDefault<>(
+                () ->
+                    EncodedObject.staticParse(
+                        readBuffer,
+                        (int) (extensionId),
+                        (ExtensionObjectEncodingMask) (encodingMask)),
+                readBuffer));
+    ExtensionObjectDefinition body =
+        readVirtualField("body", ExtensionObjectDefinition.class, data.getBody());
+
+    readBuffer.closeContext("WireExtensionObject");
+    // Create the instance
+    return new WireExtensionObjectBuilderImpl(encodingMask, data);
+  }
+
+  public static class WireExtensionObjectBuilderImpl
+      implements ExtensionObject.ExtensionObjectBuilder {
+    private final ExtensionObjectEncodingMask encodingMask;
+    private final EncodedObject data;
+
+    public WireExtensionObjectBuilderImpl(
+        ExtensionObjectEncodingMask encodingMask, EncodedObject data) {
+      this.encodingMask = encodingMask;
+      this.data = data;
+    }
+
+    public WireExtensionObject build(ExpandedNodeId typeId) {
+      WireExtensionObject wireExtensionObject = new WireExtensionObject(typeId, encodingMask, data);
+      return wireExtensionObject;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof WireExtensionObject)) {
+      return false;
+    }
+    WireExtensionObject that = (WireExtensionObject) o;
+    return (getEncodingMask() == that.getEncodingMask())
+        && (getData() == that.getData())
+        && super.equals(that)
+        && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), getEncodingMask(), getData());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteRequest.java
index 220fbd2a285..4d7b3a69a8e 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteRequest.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteRequest.java
@@ -38,8 +38,8 @@
 public class WriteRequest extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "673";
+  public Integer getExtensionId() {
+    return (int) 673;
   }
 
   // Properties.
@@ -112,7 +112,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriteRequest");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -122,8 +122,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "requestHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (RequestHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")),
+                    (RequestHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (391)),
                 readBuffer));
 
     int noOfNodesToWrite = readImplicitField("noOfNodesToWrite", readSignedInt(readBuffer, 32));
@@ -132,9 +131,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
         readCountArrayField(
             "nodesToWrite",
             new DataReaderComplexDefault<>(
-                () ->
-                    (WriteValue)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("670")),
+                () -> (WriteValue) ExtensionObjectDefinition.staticParse(readBuffer, (int) (670)),
                 readBuffer),
             noOfNodesToWrite);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteResponse.java
index 775b0b39e57..65276f8f797 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteResponse.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteResponse.java
@@ -38,8 +38,8 @@
 public class WriteResponse extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "676";
+  public Integer getExtensionId() {
+    return (int) 676;
   }
 
   // Properties.
@@ -141,7 +141,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriteResponse");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -151,8 +151,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "responseHeader",
             new DataReaderComplexDefault<>(
                 () ->
-                    (ResponseHeader)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("394")),
+                    (ResponseHeader) ExtensionObjectDefinition.staticParse(readBuffer, (int) (394)),
                 readBuffer));
 
     int noOfResults = readImplicitField("noOfResults", readSignedInt(readBuffer, 32));
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteValue.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteValue.java
index 6e89859138e..729c32c6090 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteValue.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriteValue.java
@@ -38,8 +38,8 @@
 public class WriteValue extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "670";
+  public Integer getExtensionId() {
+    return (int) 670;
   }
 
   // Properties.
@@ -121,7 +121,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriteValue");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupDataType.java
index 3cff7262b65..7638d85791f 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupDataType.java
@@ -38,8 +38,8 @@
 public class WriterGroupDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15482";
+  public Integer getExtensionId() {
+    return (int) 15482;
   }
 
   // Properties.
@@ -359,7 +359,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriterGroupDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -395,7 +395,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (EndpointDescription)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("314")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (314)),
                 readBuffer),
             noOfSecurityKeyServices);
 
@@ -410,8 +410,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             "groupProperties",
             new DataReaderComplexDefault<>(
                 () ->
-                    (KeyValuePair)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("14535")),
+                    (KeyValuePair) ExtensionObjectDefinition.staticParse(readBuffer, (int) (14535)),
                 readBuffer),
             noOfGroupProperties);
 
@@ -456,7 +455,7 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit
             new DataReaderComplexDefault<>(
                 () ->
                     (DataSetWriterDataType)
-                        ExtensionObjectDefinition.staticParse(readBuffer, (String) ("15599")),
+                        ExtensionObjectDefinition.staticParse(readBuffer, (int) (15599)),
                 readBuffer),
             noOfDataSetWriters);
 
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupMessageDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupMessageDataType.java
index 3063119195f..ca36a3763d1 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupMessageDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupMessageDataType.java
@@ -38,8 +38,8 @@
 public class WriterGroupMessageDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15618";
+  public Integer getExtensionId() {
+    return (int) 15618;
   }
 
   public WriterGroupMessageDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriterGroupMessageDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupTransportDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupTransportDataType.java
index a9992f5a7e5..3edbdd71e69 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupTransportDataType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/WriterGroupTransportDataType.java
@@ -38,8 +38,8 @@
 public class WriterGroupTransportDataType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "15613";
+  public Integer getExtensionId() {
+    return (int) 15613;
   }
 
   public WriterGroupTransportDataType() {
@@ -71,7 +71,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("WriterGroupTransportDataType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/XVType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/XVType.java
index 1086dfca26a..cb9e26313df 100644
--- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/XVType.java
+++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/XVType.java
@@ -38,8 +38,8 @@
 public class XVType extends ExtensionObjectDefinition implements Message {
 
   // Accessors for discriminator values.
-  public String getExtensionId() {
-    return (String) "12082";
+  public Integer getExtensionId() {
+    return (int) 12082;
   }
 
   // Properties.
@@ -97,7 +97,7 @@ public int getLengthInBits() {
   }
 
   public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinitionBuilder(
-      ReadBuffer readBuffer, String extensionId) throws ParseException {
+      ReadBuffer readBuffer, Integer extensionId) throws ParseException {
     readBuffer.pullContext("XVType");
     PositionAware positionAware = readBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();